Changeset a4b3685 in git for readers/DelphesCMSFWLite.cpp
- Timestamp:
- May 16, 2018, 8:26:56 AM (7 years ago)
- Branches:
- ImprovedOutputFile, Timing, dual_readout, llp, master
- Children:
- bfe749b
- Parents:
- cdcceb7 (diff), 3fa0357 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
readers/DelphesCMSFWLite.cpp
rcdcceb7 ra4b3685 64 64 65 65 void ConvertInput(fwlite::Event &event, Long64_t eventCounter, 66 ExRootTreeBranch *branchEvent, ExRootTreeBranch *branch Rwgt,66 ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchWeight, 67 67 DelphesFactory *factory, TObjArray *allParticleOutputArray, 68 68 TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent) … … 153 153 for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo) 154 154 { 155 weight = static_cast<Weight *>(branch Rwgt->NewEntry());155 weight = static_cast<Weight *>(branchWeight->NewEntry()); 156 156 weight->Weight = itWeightsInfo->wgt; 157 157 } … … 292 292 TStopwatch eventStopWatch; 293 293 ExRootTreeWriter *treeWriter = 0; 294 ExRootTreeBranch *branchEvent = 0, *branch Rwgt = 0;294 ExRootTreeBranch *branchEvent = 0, *branchWeight = 0; 295 295 ExRootConfReader *confReader = 0; 296 296 Delphes *modularDelphes = 0; … … 333 333 334 334 branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class()); 335 branch Rwgt = treeWriter->NewBranch("Weight", Weight::Class());335 branchWeight = treeWriter->NewBranch("Weight", Weight::Class()); 336 336 337 337 confReader = new ExRootConfReader; … … 377 377 for(event.toBegin(); !event.atEnd() && !interrupted; ++event) 378 378 { 379 ConvertInput(event, eventCounter, branchEvent, branch Rwgt, factory,379 ConvertInput(event, eventCounter, branchEvent, branchWeight, factory, 380 380 allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent); 381 381 modularDelphes->ProcessTask();
Note:
See TracChangeset
for help on using the changeset viewer.