Changeset 7b461f6 in git

Timestamp:

May 30, 2013, 12:48:26 AM (12 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a1f42b2

Parents:

84a1f7d

Message:

add MaxEvents and SkipEvents

Location:

readers

Files:

• DelphesHepMC.cpp (modified) (4 diffs)
• DelphesLHEF.cpp (modified) (4 diffs)
• DelphesSTDHEP.cpp (modified) (4 diffs)

readers/DelphesHepMC.cpp

@@ -51 +51 @@
   TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
   DelphesHepMCReader *reader = 0;
-  Int_t i;
+  Int_t i, maxEvents, skipEvents;
   Long64_t length, eventCounter;
 
@@ -88 +88 @@
     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");
@@ -146 +159 @@
       reader->Clear();
       readStopWatch.Start();
-      while(reader->ReadBlock(factory, allParticleOutputArray,
+      while((maxEvents <= 0 || eventCounter - skipEvents < maxEvents) &&
+        reader->ReadBlock(factory, allParticleOutputArray,
         stableParticleOutputArray, partonOutputArray) && !interrupted)
       {
@@ -154 +168 @@
 
           readStopWatch.Stop();
-          procStopWatch.Start();
-          modularDelphes->ProcessTask();
-          procStopWatch.Stop();
-
-          reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
-
-          treeWriter->Fill();
-
-          treeWriter->Clear();
+
+          if(eventCounter > skipEvents)
+          {
+            procStopWatch.Start();
+            modularDelphes->ProcessTask();
+            procStopWatch.Stop();
+
+            reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
+
+            treeWriter->Fill();
+
+            treeWriter->Clear();
+          }
+
           modularDelphes->Clear();
           reader->Clear();

readers/DelphesLHEF.cpp

@@ -51 +51 @@
   TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
   DelphesLHEFReader *reader = 0;
-  Int_t i;
+  Int_t i, maxEvents, skipEvents;
   Long64_t length, eventCounter;
 
@@ -88 +88 @@
     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");
@@ -146 +159 @@
       reader->Clear();
       readStopWatch.Start();
-      while(reader->ReadBlock(factory, allParticleOutputArray,
+      while((maxEvents <= 0 || eventCounter - skipEvents < maxEvents) &&
+        reader->ReadBlock(factory, allParticleOutputArray,
         stableParticleOutputArray, partonOutputArray) && !interrupted)
       {
@@ -154 +168 @@
 
           readStopWatch.Stop();
-          procStopWatch.Start();
-          modularDelphes->ProcessTask();
-          procStopWatch.Stop();
-
-          reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
-
-          treeWriter->Fill();
-
-          treeWriter->Clear();
+
+          if(eventCounter > skipEvents)
+          {
+            readStopWatch.Stop();
+            procStopWatch.Start();
+            modularDelphes->ProcessTask();
+            procStopWatch.Stop();
+
+            reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
+
+            treeWriter->Fill();
+
+            treeWriter->Clear();
+          }
+
           modularDelphes->Clear();
           reader->Clear();

readers/DelphesSTDHEP.cpp

@@ -51 +51 @@
   TObjArray *stableParticleOutputArray = 0, *allParticleOutputArray = 0, *partonOutputArray = 0;
   DelphesSTDHEPReader *reader = 0;
-  Int_t i;
+  Int_t i, maxEvents, skipEvents;
   Long64_t length, eventCounter;
 
@@ -88 +88 @@
     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");
@@ -146 +159 @@
       reader->Clear();
       readStopWatch.Start();
-      while(reader->ReadBlock(factory, allParticleOutputArray,
+      while((maxEvents <= 0 || eventCounter - skipEvents < maxEvents) &&
+        reader->ReadBlock(factory, allParticleOutputArray,
         stableParticleOutputArray, partonOutputArray) && !interrupted)
       {
@@ -154 +168 @@
 
           readStopWatch.Stop();
-          procStopWatch.Start();
-          modularDelphes->ProcessTask();
-          procStopWatch.Stop();
-
-          reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
-
-          treeWriter->Fill();
-
-          treeWriter->Clear();
+
+          if(eventCounter > skipEvents)
+          {
+            procStopWatch.Start();
+            modularDelphes->ProcessTask();
+            procStopWatch.Stop();
+
+            reader->AnalyzeEvent(branchEvent, eventCounter, &readStopWatch, &procStopWatch);
+
+            treeWriter->Fill();
+
+            treeWriter->Clear();
+          }
+
           modularDelphes->Clear();
           reader->Clear();