ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/MitProd/TreeFiller/src/FillMitTree.cc

Comparing UserCode/MitProd/TreeFiller/src/FillMitTree.cc (file contents):
Revision 1.51 by loizides, Wed Nov 25 14:45:40 2009 UTC vs.
Revision 1.56 by bendavid, Thu Mar 18 20:21:00 2010 UTC

#	Line 15 | Line 15
15		#include "MitProd/TreeFiller/interface/FillerConversions.h"
16		#include "MitProd/TreeFiller/interface/FillerDecayParts.h"
17		#include "MitProd/TreeFiller/interface/FillerElectrons.h"
18	+	#include "MitProd/TreeFiller/interface/FillerEvtSelData.h"
19		#include "MitProd/TreeFiller/interface/FillerGenJets.h"
20		#include "MitProd/TreeFiller/interface/FillerGenMet.h"
21		#include "MitProd/TreeFiller/interface/FillerMCEventInfo.h"
#	Line 34 | Line 35
35		#include "MitProd/TreeFiller/interface/FillerStripHits.h"
36		#include "MitProd/TreeFiller/interface/FillerSuperClusters.h"
37		#include "MitProd/TreeFiller/interface/FillerTracks.h"
38	+	#include "MitProd/TreeFiller/interface/FillerTrackJets.h"
39		#include "MitProd/TreeFiller/interface/FillerVertexes.h"
40		#include "MitAna/DataTree/interface/Names.h"
41		#include "MitAna/DataTree/interface/BranchTable.h"
#	Line 88 | Line 90 | bool FillMitTree::addActiveFiller(BaseFi
90		}
91
92		//--------------------------------------------------------------------------------------------------
93	+	void FillMitTree::beginRun(edm::Run const &run, edm::EventSetup const &setup)
94	+	{
95	+	// Access and copy event content.
96	+
97	+	// first step: Loop over the data fillers of the various components
98	+	for (std::vector<BaseFiller*>::const_iterator iF = fillers_.begin(); iF != fillers_.end(); ++iF) {
99	+	(*iF)->FillRunBlock(run,setup);
100	+	}
101	+
102	+	}
103	+
104	+	//--------------------------------------------------------------------------------------------------
105		void FillMitTree::analyze(const edm::Event      &event,
106		const edm::EventSetup &setup)
107		{
#	Line 124 | Line 138 | void FillMitTree::analyze(const edm::Eve
138		}
139
140		//--------------------------------------------------------------------------------------------------
141	<	void FillMitTree::beginJob(const edm::EventSetup &event)
141	>	void FillMitTree::beginJob()
142		{
143		// Access the tree and book branches.
144
#	Line 146 | Line 160 | void FillMitTree::beginJob(const edm::Ev
160		// loop over the various components and book the branches
161		for (std::vector<BaseFiller*>::iterator iF = fillers_.begin(); iF != fillers_.end(); ++iF) {
162		edm::LogInfo("FillMitTree::beginJob") << "Booking for " << (*iF)->Name() << endl;
163	<	(*iF)->BookDataBlock(*tws_, event);
163	>	(*iF)->BookDataBlock(*tws_);
164		}
165
166		// call branch ref for the event tree
#	Line 220 | Line 234 | bool FillMitTree::configure(const edm::P
234		continue;
235		}
236
237	+	if (ftype.compare("FillerEvtSelData")==0) {
238	+	FillerEvtSelData *fillerEvtSelData = new FillerEvtSelData(cfg, name.c_str(), defactive_);
239	+	addActiveFiller(fillerEvtSelData);
240	+	continue;
241	+	}
242	+
243		if (ftype.compare("FillerBeamSpot")==0) {
244		FillerBeamSpot *fillerBeamSpot = new FillerBeamSpot(cfg, name.c_str(), defactive_);
245		addActiveFiller(fillerBeamSpot);
246		continue;
247		}
248	<
248	>
249		if (ftype.compare("FillerVertexes")==0) {
250		FillerVertexes *fillerVertexes = new FillerVertexes(cfg, name.c_str(), defactive_);
251		addActiveFiller(fillerVertexes);
#	Line 367 | Line 387 | bool FillMitTree::configure(const edm::P
387		addActiveFiller(fillerPFTaus);
388		continue;
389		}
390	+
391	+	if (ftype.compare("FillerTrackJets")==0) {
392	+	FillerTrackJets *fillerTrackJets = new FillerTrackJets(cfg, name.c_str(), defactive_);
393	+	addActiveFiller(fillerTrackJets);
394	+	continue;
395	+	}
396
397		edm::LogError("FillMitTree")
398		<< "Unknown fillerType " << ftype << " for pset named " << name << std::endl;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines