Changeset 1185 in svn for trunk

Timestamp:

Jul 4, 2013, 2:45:47 PM (11 years ago)

Author:

Pavel Demin

Message:

name event counters as in other readers

Location:

trunk/readers

Files:

• DelphesCMSFWLite.cpp (modified) (2 diffs)
• DelphesProMC.cpp (modified) (4 diffs)
• DelphesPythia8.cpp (modified) (2 diffs)

trunk/readers/DelphesCMSFWLite.cpp

@@ -201 +201 @@
       if(numberOfEvents <= 0) continue;
 
-      ExRootProgressBar progressBar(numberOfEvents - 1);
+      // ExRootProgressBar progressBar(numberOfEvents - 1);
+      ExRootProgressBar progressBar(-1);
 
       // Loop over all objects
@@ -217 +218 @@
         treeWriter->Clear();
 
-        progressBar.Update(eventCounter);
+        progressBar.Update(eventCounter, eventCounter);
         ++eventCounter;
       }
+
+      progressBar.Update(eventCounter, eventCounter, kTRUE);
       progressBar.Finish();
 

trunk/readers/DelphesProMC.cpp

@@ -154 +154 @@
   TObjArray *allParticleOutputArray = 0, *stableParticleOutputArray = 0, *partonOutputArray = 0;
   Int_t i;
-  Long64_t entry, allEntries;
+  Long64_t eventCounter, numberOfEvents;
 
   if(argc < 4)
@@ -213 +213 @@
       }
 
-      allEntries = inputFile->getEvents();;
-
-      if(allEntries <= 0) continue;
-
-      ExRootProgressBar progressBar(allEntries - 1);
+      numberOfEvents = inputFile->getEvents();;
+
+      if(numberOfEvents <= 0) continue;
+
+      ExRootProgressBar progressBar(numberOfEvents - 1);
 
       // Loop over all objects
@@ -223 +223 @@
       treeWriter->Clear();
       readStopWatch.Start();
-      for(entry = 0; entry < allEntries && !interrupted; ++entry)
+      for(eventCounter = 0; eventCounter < numberOfEvents && !interrupted; ++eventCounter)
       {
         if(inputFile->next() != 0) continue;
@@ -243 +243 @@
 
         readStopWatch.Start();
-        progressBar.Update(entry);
+        progressBar.Update(eventCounter);
       }
+
+      progressBar.Update(eventCounter, eventCounter, kTRUE);
       progressBar.Finish();
 

trunk/readers/DelphesPythia8.cpp

@@ -206 +206 @@
     pythia->init();
 
-    ExRootProgressBar progressBar(numberOfEvents - 1);
+    // ExRootProgressBar progressBar(numberOfEvents - 1);
+    ExRootProgressBar progressBar(-1);
 
     // Loop over all events
@@ -245 +246 @@
 
       readStopWatch.Start();
-      progressBar.Update(eventCounter);
-    }
-
+      progressBar.Update(eventCounter, eventCounter);
+    }
+
+    progressBar.Update(eventCounter, eventCounter, kTRUE);
     progressBar.Finish();