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

Comparing UserCode/MitProd/TreeFiller/src/FillerConversionElectrons.cc (file contents):
Revision 1.3 by loizides, Mon Jul 7 16:14:01 2008 UTC vs.
Revision 1.8 by bendavid, Thu Feb 26 17:04:03 2009 UTC

# Line 12 | Line 12 | using namespace edm;
12   using namespace mithep;
13  
14   //--------------------------------------------------------------------------------------------------
15 < FillerConversionElectrons::FillerConversionElectrons(const edm::ParameterSet &cfg, bool active,
16 <                                                     const TrackCol *convInOutTracks,
17 <                                                     const TrackCol *convOutInTracks,
18 <                                                     const TrackMap *convInOutTrackMap,
19 <                                                     const TrackMap *convOutInTrackMap) :
20 <  BaseFiller(cfg, "ConversionElectrons", active),
21 <  mitName_(Conf().getUntrackedParameter<string>("mitName","")),
22 <  conversionElectrons_(new mithep::ElectronArr),
23 <  convElectronMap_(new mithep::ConversionElectronMap),
24 <  conversionInOutTracks_(convInOutTracks),
25 <  conversionOutInTracks_(convOutInTracks),
26 <  conversionInOutTrackMap_(convInOutTrackMap),
27 <  conversionOutInTrackMap_(convOutInTrackMap)
15 > FillerConversionElectrons::FillerConversionElectrons(const edm::ParameterSet &cfg, bool active) :
16 >  BaseFiller(cfg,"ConversionElectrons",active),
17 >  mitName_(Conf().getUntrackedParameter<string>("mitName","ConversionElectrons")),
18 >  convInOutTracksName_(Conf().getUntrackedParameter<string>("convInOutTracksName","")),
19 >  convOutInTracksName_(Conf().getUntrackedParameter<string>("convOutInTracksName","")),
20 >  convInOutTrackMapName_(Conf().getUntrackedParameter<string>("convInOutTrackMapName","")),
21 >  convOutInTrackMapName_(Conf().getUntrackedParameter<string>("convOutInTrackMapName","")),
22 >  convElectronMapName_(Conf().getUntrackedParameter<string>("convElectronMapName",
23 >                                                            Form("%sMapName",mitName_.c_str()))),
24 >  convInOutTracks_(0),
25 >  convOutInTracks_(0),
26 >  convInOutTrackMap_(0),
27 >  convOutInTrackMap_(0),
28 >  convElectrons_(new mithep::ElectronArr(16)),
29 >  convElectronMap_(new mithep::ConversionElectronMap)
30   {
31    // Constructor.
32   }
# Line 34 | Line 36 | FillerConversionElectrons::~FillerConver
36   {
37    // Destructor.
38  
39 <  delete conversionElectrons_;
39 >  delete convElectrons_;
40    delete convElectronMap_;
41   }
42  
43   //--------------------------------------------------------------------------------------------------
44   void FillerConversionElectrons::BookDataBlock(TreeWriter &tws)
45   {
46 <  // Add converted electron branch to tree.
46 >  // Add converted electron branch to tree. Publish and get our objects.
47  
48 <  tws.AddBranch(mitName_.c_str(),&conversionElectrons_);
48 >  tws.AddBranch(mitName_.c_str(),&convElectrons_);
49 >
50 >  OS()->add<ElectronArr>(convElectrons_,mitName_.c_str());
51 >  OS()->add<ConversionElectronMap>(convElectronMap_,convElectronMapName_.c_str());
52 >  convInOutTracks_ = OS()->get<TrackArr>(convInOutTracksName_.c_str());
53 >  convOutInTracks_ = OS()->get<TrackArr>(convOutInTracksName_.c_str());
54 >  convInOutTrackMap_ = OS()->get<TrackMap>(convInOutTrackMapName_.c_str());
55 >  convOutInTrackMap_ = OS()->get<TrackMap>(convOutInTrackMapName_.c_str());
56   }
57  
58   //--------------------------------------------------------------------------------------------------
# Line 52 | Line 61 | void FillerConversionElectrons::FillData
61   {
62    // Fill converted electron array.
63  
64 <  conversionElectrons_->Reset();
64 >  convElectrons_->Delete();
65    convElectronMap_->Reset();
66 <  FillFromTracks(conversionInOutTracks_, conversionInOutTrackMap_);
67 <  FillFromTracks(conversionOutInTracks_, conversionOutInTrackMap_);
68 <  conversionElectrons_->Trim();
66 >  FillFromTracks(convInOutTracks_, convInOutTrackMap_);
67 >  FillFromTracks(convOutInTracks_, convOutInTrackMap_);
68 >  convElectrons_->Trim();
69   }
70  
71   //--------------------------------------------------------------------------------------------------
# Line 67 | Line 76 | void FillerConversionElectrons::FillFrom
76  
77    for (UInt_t i=0; i<tracks->GetEntries(); ++i) {
78      mithep::Track *track = const_cast<Track*>(tracks->At(i));
79 <    mithep::Electron* electron = conversionElectrons_->AddNew();
80 <    electron->SetTrackerTrack(track);
81 <    convElectronMap_->Add(trackMap->GetEdmRef(track), electron);
79 >    mithep::Electron *electron = convElectrons_->AddNew();
80 >    electron->SetTrackerTrk(track);
81 >    convElectronMap_->Add(trackMap->GetEdm(track), electron);
82    }
83   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines