From 518ecba801816e3bc6c715df4b72bfcf541a345d Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Mon, 7 Feb 2011 22:39:48 +0000
Subject: [PATCH] * Homogeneisation of progression display for NPA project
---
NPAnalysis/10He_Riken/src/Analysis.cc | 20 +++++++++-----------
NPAnalysis/Hyde/src/Analysis.cc | 10 +++++++++-
NPAnalysis/Paris/src/Analysis.cc | 11 ++++++++++-
NPAnalysis/Template/src/Analysis.cc | 1 +
NPAnalysis/W1/src/Analysis.cc | 1 +
NPAnalysis/must2/src/Analysis.cc | 1 +
6 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc
index 7e10ea0ba..89a1bde47 100644
--- a/NPAnalysis/10He_Riken/src/Analysis.cc
+++ b/NPAnalysis/10He_Riken/src/Analysis.cc
@@ -104,17 +104,15 @@ int main(int argc,char** argv)
}
// Minimum code
- if( i%10000 == 0 && i!=0) {
- cout.precision(5);
- end=clock();
- double TimeElapsed = (end-begin)/CLOCKS_PER_SEC;
- double percent = (double)i/N ;
- double TimeToWait = (TimeElapsed/percent) - TimeElapsed ;
- cout << "\r Progression:" << percent*100
- << " % \t | \t Remaining time : ~"
- << TimeToWait <<"s"<< flush;
- }
-
+ if (i%10000 == 0 && i!=0) {
+ cout.precision(5);
+ end = clock();
+ double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
+ double percent = (double)i / nentries;
+ double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
+ cout << " "<< flush;
+ cout << "\rProgression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait << "s" << flush;
+ }
else if (i==N-1) cout << "\r Progression:"
<< " 100% " <<endl;
diff --git a/NPAnalysis/Hyde/src/Analysis.cc b/NPAnalysis/Hyde/src/Analysis.cc
index ed0b9fc24..1dd091b07 100644
--- a/NPAnalysis/Hyde/src/Analysis.cc
+++ b/NPAnalysis/Hyde/src/Analysis.cc
@@ -93,7 +93,15 @@ int main(int argc,char** argv)
// Loop on all events
for (int i = 0; i < nentries; i ++) {
- if (i%10000 == 0 && i!=0) cout << "\r" << i << " analyzed events" << flush;
+ if (i%10000 == 0 && i!=0) {
+ cout.precision(5);
+ end = clock();
+ double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
+ double percent = (double)i / nentries;
+ double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
+ cout << " "<< flush;
+ cout << "\rProgression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait << "s" << flush;
+ }
chain -> GetEntry(i);
// Treat Gaspard event
diff --git a/NPAnalysis/Paris/src/Analysis.cc b/NPAnalysis/Paris/src/Analysis.cc
index cfb1ef3cd..d6f3bf0d5 100644
--- a/NPAnalysis/Paris/src/Analysis.cc
+++ b/NPAnalysis/Paris/src/Analysis.cc
@@ -83,7 +83,16 @@ int main(int argc,char** argv)
cout << "Number of entries to be analysed: " << nentries << endl;
for (int i = 0; i < nentries; i ++) {
- if (i%10000 == 0 && i!=0) cout << "\r" << i << " analyzed events" << flush;
+ if (i%10000 == 0 && i!=0) {
+ cout.precision(5);
+ end = clock();
+ double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
+ double percent = (double)i / nentries;
+ double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
+ cout << " "<< flush;
+ cout << "\rProgression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait << "s" << flush;
+ }
+ else if (i == nentries-1) cout << "\rProgression:" << " 100%" << endl;
chain -> GetEntry(i);
diff --git a/NPAnalysis/Template/src/Analysis.cc b/NPAnalysis/Template/src/Analysis.cc
index 8da4c154f..a8e22c0c7 100644
--- a/NPAnalysis/Template/src/Analysis.cc
+++ b/NPAnalysis/Template/src/Analysis.cc
@@ -59,6 +59,7 @@ int main(int argc, char** argv)
double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
double percent = (double)i/nentries;
double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
+ cout << " "<< flush;
cout << "\r Progression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait <<"s"<< flush;
}
else if (i == nentries-1) cout << "\r Progression:" << " 100% " <<endl;
diff --git a/NPAnalysis/W1/src/Analysis.cc b/NPAnalysis/W1/src/Analysis.cc
index 3434851aa..9f9484c12 100644
--- a/NPAnalysis/W1/src/Analysis.cc
+++ b/NPAnalysis/W1/src/Analysis.cc
@@ -104,6 +104,7 @@ int main(int argc,char** argv)
double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
double percent = (double)i / nentries;
double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
+ cout << " "<< flush;
cout << "\rProgression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait << "s" << flush;
}
else if (i == nentries-1) cout << "\rProgression:" << " 100%" << endl;
diff --git a/NPAnalysis/must2/src/Analysis.cc b/NPAnalysis/must2/src/Analysis.cc
index 3f9e7dac8..1bf39a83d 100644
--- a/NPAnalysis/must2/src/Analysis.cc
+++ b/NPAnalysis/must2/src/Analysis.cc
@@ -109,6 +109,7 @@ int main(int argc,char** argv)
double TimeElapsed = (end-begin) / CLOCKS_PER_SEC;
double percent = (double)i/N ;
double TimeToWait = (TimeElapsed/percent) - TimeElapsed;
+ cout << " "<< flush;
cout << "\r Progression:" << percent*100 << " % \t | \t Remaining time : ~" << TimeToWait <<"s"<< flush;
}
else if (i==N-1) cout << "\r Progression:" << " 100% " <<endl;
--
GitLab