Changes in readers/DelphesCMSFWLite.cpp [7611cb9:355a7d7] in git

File:

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

readers/DelphesCMSFWLite.cpp

@@ -65 +65 @@
   ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
   DelphesFactory *factory, TObjArray *allParticleOutputArray,
-  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
+  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
 {
-
   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");
-
-  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());
+  handleLHEEvent.getByLabel(event, "externalLHEProducer");
+  handleParticle.getByLabel(event, "genParticles");
 
   HepMCEvent *element;
@@ -118 +91 @@
   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());
@@ -141 +117 @@
   element->ProcTime = 0.0;
 
-
-  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;
-    }  
+  for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
+  {
+    weight = static_cast<Weight *>(branchRwgt->NewEntry());
+    weight->Weight = itWeightsInfo->wgt;
   }
 
@@ -238 +207 @@
   Int_t i;
   Long64_t eventCounter, numberOfEvents;
-  Bool_t firstEvent = kTRUE;
 
   if(argc < 4)
@@ -272 +240 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
-    branchRwgt = treeWriter->NewBranch("Rwgt", Weight::Class());
+    branchRwgt = treeWriter->NewBranch("Weight", Weight::Class());
 
     confReader = new ExRootConfReader;
@@ -313 +281 @@
       modularDelphes->Clear();
       treeWriter->Clear();
-
       for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
         ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
-          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
         modularDelphes->ProcessTask();
-          
-        firstEvent = kFALSE;
 
         treeWriter->Fill();