Fork me on GitHub

Changeset a4b3685 in git for readers/DelphesCMSFWLite.cpp


Ignore:
Timestamp:
May 16, 2018, 8:26:56 AM (7 years ago)
Author:
Basil Schneider <basil.schneider@…>
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.
Message:

Merge with master

File:
1 edited

Legend:

Unmodified
Added
Removed
  • readers/DelphesCMSFWLite.cpp

    rcdcceb7 ra4b3685  
    6464
    6565void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
    66   ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
     66  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchWeight,
    6767  DelphesFactory *factory, TObjArray *allParticleOutputArray,
    6868  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
     
    153153    for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
    154154    {
    155       weight = static_cast<Weight *>(branchRwgt->NewEntry());
     155      weight = static_cast<Weight *>(branchWeight->NewEntry());
    156156      weight->Weight = itWeightsInfo->wgt;
    157157    }
     
    292292  TStopwatch eventStopWatch;
    293293  ExRootTreeWriter *treeWriter = 0;
    294   ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
     294  ExRootTreeBranch *branchEvent = 0, *branchWeight = 0;
    295295  ExRootConfReader *confReader = 0;
    296296  Delphes *modularDelphes = 0;
     
    333333
    334334    branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
    335     branchRwgt = treeWriter->NewBranch("Weight", Weight::Class());
     335    branchWeight = treeWriter->NewBranch("Weight", Weight::Class());
    336336
    337337    confReader = new ExRootConfReader;
     
    377377      for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
    378378      {
    379         ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
     379        ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
    380380          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
    381381        modularDelphes->ProcessTask();
Note: See TracChangeset for help on using the changeset viewer.