ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitProd/TreeFiller/src/FillMitTree.cc
(Generate patch)

Comparing UserCode/MitProd/TreeFiller/src/FillMitTree.cc (file contents):
Revision 1.7 by loizides, Tue Jul 1 21:11:47 2008 UTC vs.
Revision 1.9 by loizides, Thu Jul 3 07:56:14 2008 UTC

# Line 11 | Line 11
11   #include "MitProd/TreeFiller/interface/FillerGsfTracks.h"
12   #include "MitProd/TreeFiller/interface/FillerMuons.h"
13   #include "MitProd/TreeFiller/interface/FillerElectrons.h"
14 < //#include "MitProd/TreeFiller/interface/FillerConvElectrons.h"
15 < //#include "MitProd/TreeFiller/interface/FillerPhotons.h"
14 > #include "MitProd/TreeFiller/interface/FillerConversionElectrons.h"
15 > #include "MitProd/TreeFiller/interface/FillerConversions.h"
16 > #include "MitProd/TreeFiller/interface/FillerPhotons.h"
17   #include "MitProd/TreeFiller/interface/FillerGenParts.h"
18  
19   using namespace std;
20   using namespace edm;
21   using namespace mithep;
22  
23 < //-------------------------------------------------------------------------------------------------
23 > //--------------------------------------------------------------------------------------------------
24   FillMitTree::FillMitTree(const edm::ParameterSet &cfg) :
25    defactive_(cfg.getUntrackedParameter<bool>("defactive",1))
26   {
# Line 31 | Line 32 | FillMitTree::FillMitTree(const edm::Para
32    }
33   }
34  
35 < //-------------------------------------------------------------------------------------------------
35 > //--------------------------------------------------------------------------------------------------
36   FillMitTree::~FillMitTree()
37   {
38    // Destructor: nothing to be done here.
39   }
40  
41 < //-------------------------------------------------------------------------------------------------
41 > //--------------------------------------------------------------------------------------------------
42   void FillMitTree::analyze(const edm::Event      &event,
43                            const edm::EventSetup &setup)
44   {
# Line 54 | Line 55 | void FillMitTree::analyze(const edm::Eve
55    }
56   }
57  
58 < //-------------------------------------------------------------------------------------------------
58 > //--------------------------------------------------------------------------------------------------
59   void FillMitTree::beginJob(const edm::EventSetup &event)
60   {
61    // Access the tree and book branches.
# Line 73 | Line 74 | void FillMitTree::beginJob(const edm::Ev
74    }
75   }
76  
77 < //-------------------------------------------------------------------------------------------------
77 > //--------------------------------------------------------------------------------------------------
78   bool FillMitTree::configure(const edm::ParameterSet &cfg)
79   {
80    // Configure our fillers.
# Line 99 | Line 100 | bool FillMitTree::configure(const edm::P
100    else
101      delete fillerSimParticles;  
102    
103 <  FillerTracks *fillerGeneralTracks = new FillerTracks(cfg,"GeneralTracks",defactive_,simParticleMap);
103 >  FillerTracks *fillerGeneralTracks =
104 >    new FillerTracks(cfg,"GeneralTracks",defactive_,simParticleMap);
105    const TrackMap* generalTrackMap=0;
106    if (fillerGeneralTracks->Active()) {
107      fillers_.push_back(fillerGeneralTracks);
# Line 108 | Line 110 | bool FillMitTree::configure(const edm::P
110    else
111      delete fillerGeneralTracks;
112      
113 <  FillerTracks *fillerStandaloneMuonTracks = new FillerTracks(cfg,"StandaloneMuonTracks",defactive_);
113 >  FillerTracks *fillerStandaloneMuonTracks =
114 >    new FillerTracks(cfg,"StandaloneMuonTracks",defactive_);
115    const TrackMap* standaloneMuonTrackMap=0;
116    if (fillerStandaloneMuonTracks->Active()) {
117      fillers_.push_back(fillerStandaloneMuonTracks);
# Line 160 | Line 163 | bool FillMitTree::configure(const edm::P
163    else
164      delete fillerConversionOutInTracks;
165      
166 <  FillerGsfTracks *fillerGsfTracks = new FillerGsfTracks(cfg,"GsfTracks",defactive_,simParticleMap);
166 >  FillerGsfTracks *fillerGsfTracks =
167 >    new FillerGsfTracks(cfg,"GsfTracks",defactive_,simParticleMap);
168    const GsfTrackMap* gsfTrackMap=0;
169    if (fillerGsfTracks->Active()) {
170      fillers_.push_back(fillerGsfTracks);
# Line 177 | Line 181 | bool FillMitTree::configure(const edm::P
181    else
182      delete fillerMuons;
183      
184 <  FillerElectrons *fillerElectrons = new FillerElectrons(cfg,defactive_,gsfTrackMap,generalTrackMap);
184 >  FillerElectrons *fillerElectrons =
185 >    new FillerElectrons(cfg,defactive_,gsfTrackMap,generalTrackMap);
186    if (fillerElectrons->Active())
187      fillers_.push_back(fillerElectrons);
188    else
189      delete fillerElectrons;
190    
186 #if 0
191    FillerConversionElectrons *fillerConversionElectrons =
192 <    new FillerConversionElectrons(cfg,defactive_,conversionInOutTracks,conversionOutInTracks,
193 <                                  conversionInOutTrackMap,conversionOutInTrackMap);
190 <
192 >    new FillerConversionElectrons(cfg, defactive_, conversionInOutTracks, conversionOutInTracks,
193 >                                  conversionInOutTrackMap, conversionOutInTrackMap);
194    const ConversionElectronMap* convElectronMap=0;
195    if (fillerConversionElectrons->Active()) {
196      fillers_.push_back(fillerConversionElectrons);
# Line 196 | Line 199 | bool FillMitTree::configure(const edm::P
199    else
200      delete fillerConversionElectrons;
201      
202 <  FillerPhotons *fillerPhotons = new FillerPhotons(cfg,defactive_,convElectronMap);
202 >  FillerConversions *fillerConversions = new FillerConversions(cfg, defactive_, convElectronMap);
203 >  const ConversionMap* conversionMap=0;
204 >  if (fillerConversions->Active()) {
205 >    fillers_.push_back(fillerConversions);
206 >    conversionMap = fillerConversions->GetConversionMap();
207 >  }
208 >  else
209 >    delete fillerConversions;
210 >    
211 >  FillerPhotons *fillerPhotons = new FillerPhotons(cfg, defactive_, conversionMap);
212    if (fillerPhotons->Active())
213      fillers_.push_back(fillerPhotons);
214 <  else
214 >  else
215      delete fillerPhotons;
216 < #endif
216 >
217  
218    return 1;
219   }
220  
221 < //-------------------------------------------------------------------------------------------------
221 > //--------------------------------------------------------------------------------------------------
222   void FillMitTree::endJob()
223   {
224    // Delete fillers.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines