Changeset fbad4c7 in git for readers

Timestamp:

May 24, 2018, 9:12:31 PM (7 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4689481

Parents:

4fd4f01 (diff), 792092a (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 branch 'master' into photonId

Conflicts:

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

Location:

readers

Files:

• CMakeLists.txt (modified) (1 diff)
• DelphesCMSFWLite.cpp (modified) (5 diffs)
• DelphesHepMC.cpp (modified) (3 diffs)

readers/CMakeLists.txt

@@ -9 +9 @@
 list(REMOVE_ITEM executables DelphesCMSFWLite.cpp)
 list(REMOVE_ITEM executables DelphesProMC.cpp)
-list(REMOVE_ITEM executables DelphesPythia8.cpp)
+if(NOT PYTHIA8_FOUND)
+  list(REMOVE_ITEM executables DelphesPythia8.cpp)
+endif()
 
 # build all executables and put them into bin/

readers/DelphesCMSFWLite.cpp

@@ -64 +64 @@
 
 void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
-  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
+  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchWeight,
   DelphesFactory *factory, TObjArray *allParticleOutputArray,
   TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
@@ -153 +153 @@
     for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
     {
-      weight = static_cast<Weight *>(branchRwgt->NewEntry());
+      weight = static_cast<Weight *>(branchWeight->NewEntry());
       weight->Weight = itWeightsInfo->wgt;
     }
@@ -292 +292 @@
   TStopwatch eventStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
+  ExRootTreeBranch *branchEvent = 0, *branchWeight = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -333 +333 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
-    branchRwgt = treeWriter->NewBranch("Weight", Weight::Class());
+    branchWeight = treeWriter->NewBranch("Weight", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -377 +377 @@
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
-        ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
+        ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
           allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
         modularDelphes->ProcessTask();

readers/DelphesHepMC.cpp

@@ -63 +63 @@
   TStopwatch readStopWatch, procStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0;
+  ExRootTreeBranch *branchEvent = 0, *branchWeight = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -103 +103 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
+    branchWeight = treeWriter->NewBranch("Weight", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -194 +195 @@
 
             reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
+            reader->AnalyzeWeight(branchWeight);
 
             treeWriter->Fill();