Changeset dd514ae in git for readers

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

File:

• readers/DelphesCMSFWLite.cpp (modified) (8 diffs)

readers/DelphesCMSFWLite.cpp

@@ -56 +56 @@
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/WeightsInfo.h"
 
 using namespace std;
@@ -62 +64 @@
 
 void ConvertInput(fwlite::Event &event, Long64_t eventCounter,
-  ExRootTreeBranch *branchEvent, DelphesFactory *factory,
-  TObjArray *allParticleOutputArray, TObjArray *stableParticleOutputArray,
-  TObjArray *partonOutputArray)
+  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
+  DelphesFactory *factory, TObjArray *allParticleOutputArray,
+  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
 {
   fwlite::Handle< GenEventInfoProduct > handleGenEventInfo;
 
+  fwlite::Handle< LHEEventProduct > handleLHEEvent;
+
   fwlite::Handle< vector< reco::GenParticle > > handleParticle;
   vector< reco::GenParticle >::const_iterator itParticle;
@@ -75 +79 @@
 
   handleGenEventInfo.getByLabel(event, "generator");
+  handleLHEEvent.getByLabel(event, "source");
   handleParticle.getByLabel(event, "genParticles");
 
   HepMCEvent *element;
+  Weight *weight;
   Candidate *candidate;
   TDatabasePDG *pdg;
@@ -86 +92 @@
   Double_t px, py, pz, e, mass;
   Double_t x, y, z;
+
+  const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
+  vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
 
   element = static_cast<HepMCEvent *>(branchEvent->NewEntry());
@@ -108 +117 @@
   element->ReadTime = 0.0;
   element->ProcTime = 0.0;
+
+  for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
+  {
+    weight = static_cast<Weight *>(branchRwgt->NewEntry());
+    weight->Weight = itWeightsInfo->wgt;
+  }
 
   pdg = TDatabasePDG::Instance();
@@ -186 +201 @@
   TStopwatch eventStopWatch;
   ExRootTreeWriter *treeWriter = 0;
-  ExRootTreeBranch *branchEvent = 0;
+  ExRootTreeBranch *branchEvent = 0, *branchRwgt = 0;
   ExRootConfReader *confReader = 0;
   Delphes *modularDelphes = 0;
@@ -226 +241 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
+    branchRwgt = treeWriter->NewBranch("Rwgt", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -268 +284 @@
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
-        ConvertInput(event, eventCounter, branchEvent, factory,
+        ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
           allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
         modularDelphes->ProcessTask();