Changeset 251 in svn for trunk

Timestamp:

Feb 7, 2009, 4:44:02 PM (16 years ago)

Author:

severine ovyn

Message:

add progress bar

Location:

trunk

Files:

• Delphes.cpp (modified) (4 diffs)
• Utilities/ExRootAnalysis/src/ExRootProgressBar.cc (modified) (5 diffs)

trunk/Delphes.cpp

@@ -35 +35 @@
 #include <vector>
 #include <iostream>
+
+#include "Utilities/ExRootAnalysis/interface/ExRootProgressBar.h"
 
 using namespace std;
@@ -317 +319 @@
        << right << setw(2) <<"**"<<endl;
 
+  ExRootProgressBar *Progress = new ExRootProgressBar(allEntries);
+
   loopwatch.Start();
 
@@ -322 +326 @@
   for(entry = 0; entry < allEntries; ++entry)
     {
+      Progress->Update(entry);
       TLorentzVector PTmis(0,0,0,0);
       treeReader->ReadEntry(entry);
@@ -628 +633 @@
   delete treeReader;
   delete DET;
-  delete TRIGT;
+//  delete TRIGT;
   delete TRACP;
   delete JETRUN;

trunk/Utilities/ExRootAnalysis/src/ExRootProgressBar.cc

@@ -4 +4 @@
  *  Class showing progress bar
  *
- *  $Date: 2009-02-02 11:32:01 $
- *  $Revision: 1.2 $
+ *  $Date: 2009-02-07 15:44:02 $
+ *  $Revision: 1.3 $
  *
  *
@@ -15 +15 @@
 #include "TSystem.h"
 #include <cstdio>
+#include <iostream>
 
 using namespace std;
@@ -31 +32 @@
 ExRootProgressBar::~ExRootProgressBar()
 {
-  if(fBar) delete[] fBar;
+   if(fBar) delete[] fBar;
 }
 
@@ -40 +41 @@
   ULong_t time = gSystem->Now();
 
-  if(time < fTime + 1000 && entry < fEntries - 1) return;
+  if(time < fTime + 500 && entry < fEntries - 1) return;
 
   fTime = time;
@@ -48 +49 @@
   if(hashes > fHashes)
   {
-    memset(fBar + fHashes, '#', hashes - fHashes);
+    memset(fBar + fHashes, '$', hashes - fHashes);
     fHashes = hashes;
   }
+ float frac=(entry + 1.0)/fEntries*100.0;
+ if(frac<10)   fprintf(stdout, "**         [%s] %.2f%% processed             **\r", fBar,(entry + 1.0)/fEntries*100.0);
+ if(frac==100) fprintf(stdout, "**         [%s] %.2f%% processed           **\r", fBar,(entry + 1.0)/fEntries*100.0);
+ else          fprintf(stdout, "**         [%s] %.2f%% processed            **\r", fBar,(entry + 1.0)/fEntries*100.0);
+  fflush(stdout);
 
-/*
-  cerr << "[" << fBar << "] (";
-  cerr.setf(ios::fixed);
-  cerr.precision(2);
-  cerr << (entry + 1.0)/fEntries*100.0 << "%) : ";
-  cerr << entry + 1 << "/" << fEntries;
-  cerr << " events processed\r" << flush;
-*/
-
-  fprintf(stderr, "[%s] (%.2f%%) : %lli/%lli entries processed\r", fBar,
-          (entry + 1.0)/fEntries*100.0, entry + 1, fEntries);
-  fflush(stderr);
+  if(entry+1==fEntries)
+    {
+       char temp[500];
+       sprintf(temp, "**         [%s] %.2f%% processed ", fBar,(entry + 1.0)/fEntries*100.0);
+       string mystringName(temp);
+       cout << mystringName <<endl;
+    }
 }