Changeset 1185 in svn for trunk/readers/DelphesProMC.cpp

Timestamp:

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

Author:

Pavel Demin

Message:

name event counters as in other readers

File:

• trunk/readers/DelphesProMC.cpp (modified) (4 diffs)

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();