Changeset 98ce52a in git for readers

Timestamp:

Aug 23, 2016, 3:01:17 PM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

27a1694, 91acc76, 9327245

Parents:

bdfe7f2 (diff), 7611cb9 (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' of github.com:delphes/delphes

File:

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

readers/DelphesCMSFWLite.cpp

@@ -65 +65 @@
   ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
   DelphesFactory *factory, TObjArray *allParticleOutputArray,
-  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
+  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
 {
+
   fwlite::Handle< GenEventInfoProduct > handleGenEventInfo;
-
   fwlite::Handle< LHEEventProduct > handleLHEEvent;
-
   fwlite::Handle< vector< reco::GenParticle > > handleParticle;
+
   vector< reco::GenParticle >::const_iterator itParticle;
 
@@ -78 +78 @@
 
   handleGenEventInfo.getByLabel(event, "generator");
-  handleLHEEvent.getByLabel(event, "externalLHEProducer");
-  handleParticle.getByLabel(event, "genParticles");
+
+  if (!((handleLHEEvent.getBranchNameFor(event, "source")).empty()))
+  { 
+    handleLHEEvent.getByLabel(event, "source");
+  }
+  else if (!((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty()))
+  {
+    handleLHEEvent.getByLabel(event, "externalLHEProducer");
+  }
+  else if (firstEvent)
+  {
+    std::cout<<"Wrong LHEEvent Label! Please, check the input file."<<std::endl;
+  }
+
+  if (!((handleParticle.getBranchNameFor(event, "genParticles")).empty()))
+  {
+    handleParticle.getByLabel(event, "genParticles");
+  }
+  else if (!((handleParticle.getBranchNameFor(event, "prunedGenParticles")).empty()))
+  {
+    handleParticle.getByLabel(event, "prunedGenParticles");
+  }
+  else
+  {
+    std::cout<<"Wrong GenParticle Label! Please, check the input file."<<std::endl;
+    exit(-1);
+  }
+
+  Bool_t foundLHE = !((handleLHEEvent.getBranchNameFor(event, "source")).empty()) || !((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty());
 
   HepMCEvent *element;
@@ -91 +118 @@
   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());
@@ -117 +141 @@
   element->ProcTime = 0.0;
 
-  for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
-  {
-    weight = static_cast<Weight *>(branchRwgt->NewEntry());
-    weight->Weight = itWeightsInfo->wgt;
+
+  if(foundLHE)
+  {
+    const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
+    vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
+    
+    for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
+    {
+      weight = static_cast<Weight *>(branchRwgt->NewEntry());
+      weight->Weight = itWeightsInfo->wgt;
+    }  
   }
 
@@ -207 +238 @@
   Int_t i;
   Long64_t eventCounter, numberOfEvents;
+  Bool_t firstEvent = kTRUE;
 
   if(argc < 4)
@@ -281 +313 @@
       modularDelphes->Clear();
       treeWriter->Clear();
+
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
         ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
-          allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
         modularDelphes->ProcessTask();
+          
+        firstEvent = kFALSE;
 
         treeWriter->Fill();