Changes in / [5c257a5:910bd98] in git

File:

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

readers/DelphesCMSFWLite.cpp

@@ -311 +311 @@
   DelphesFactory *factory = 0;
   TObjArray *allParticleOutputArray = 0, *stableParticleOutputArray = 0, *partonOutputArray = 0;
-  Int_t i, maxEvents, skipEvents;
+  Int_t i;
   Long64_t eventCounter, numberOfEvents;
   Bool_t firstEvent = kTRUE;
@@ -353 +353 @@
     confReader = new ExRootConfReader;
     confReader->ReadFile(argv[1]);
-    
-    maxEvents = confReader->GetInt("::MaxEvents", 0);
-    skipEvents = confReader->GetInt("::SkipEvents", 0);
-    
-    if(maxEvents < 0)
-    {
-      throw runtime_error("MaxEvents must be zero or positive");
-    }
-    
-    if(skipEvents < 0)
-    {
-      throw runtime_error("SkipEvents must be zero or positive");
-    }
 
     modularDelphes = new Delphes("Delphes");
@@ -404 +391 @@
       treeWriter->Clear();
 
-      for(event.toBegin(); !event.atEnd() && !interrupted && (maxEvents <= 0 || eventCounter-skipEvents < maxEvents); ++event)
+      for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
       {
-        if(eventCounter > skipEvents){
-          ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
-            allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
-          modularDelphes->ProcessTask();
-
-          firstEvent = kFALSE;
-
-          treeWriter->Fill();
-
-          modularDelphes->Clear();
-          treeWriter->Clear();
-        }
+        ConvertInput(event, eventCounter, branchEvent, branchWeight, factory,
+          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
+        modularDelphes->ProcessTask();
+
+        firstEvent = kFALSE;
+
+        treeWriter->Fill();
+
+        modularDelphes->Clear();
+        treeWriter->Clear();
 
         progressBar.Update(eventCounter, eventCounter);