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.8 by bendavid, Wed Jul 2 19:41:02 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;
# Line 183 | Line 184 | bool FillMitTree::configure(const edm::P
184    else
185      delete fillerElectrons;
186    
187 < #if 0
187 <  FillerConversionElectrons *fillerConversionElectrons =
188 <    new FillerConversionElectrons(cfg,defactive_,conversionInOutTracks,conversionOutInTracks,
189 <                                  conversionInOutTrackMap,conversionOutInTrackMap);
190 <
187 >  FillerConversionElectrons *fillerConversionElectrons = new FillerConversionElectrons(cfg, defactive_, conversionInOutTracks, conversionOutInTracks, conversionInOutTrackMap, conversionOutInTrackMap);
188    const ConversionElectronMap* convElectronMap=0;
189    if (fillerConversionElectrons->Active()) {
190      fillers_.push_back(fillerConversionElectrons);
# Line 196 | Line 193 | bool FillMitTree::configure(const edm::P
193    else
194      delete fillerConversionElectrons;
195      
196 <  FillerPhotons *fillerPhotons = new FillerPhotons(cfg,defactive_,convElectronMap);
196 >  FillerConversions *fillerConversions = new FillerConversions(cfg, defactive_, convElectronMap);
197 >  const ConversionMap* conversionMap=0;
198 >  if (fillerConversions->Active()) {
199 >    fillers_.push_back(fillerConversions);
200 >    conversionMap = fillerConversions->GetConversionMap();
201 >  }
202 >  else
203 >    delete fillerConversions;
204 >    
205 >  FillerPhotons *fillerPhotons = new FillerPhotons(cfg, defactive_, conversionMap);
206    if (fillerPhotons->Active())
207      fillers_.push_back(fillerPhotons);
208 <  else
208 >  else
209      delete fillerPhotons;
210 < #endif
210 >
211  
212    return 1;
213   }

Diff Legend

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