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

Diff Legend

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