diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc index 7e10ea0ba2e99757087ae56d246bebec45c52fb2..89a1bde479de3ef7fda2bdec58ede925308a9945 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 ed0b9fc24382636157ccb362cdf55bf0f3f0cb92..1dd091b0747ed218c909a24a3b7f660c4e68196b 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 cfb1ef3cdb9a2146470d3b770cea42e268e64146..d6f3bf0d54ccc14938e797f5d31fb2c69f025bfe 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 8da4c154f2bb1c48294acf5a14e8c21c53e57c5c..a8e22c0c74c9655092b6c04db4ebebc2552435fe 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 3434851aa8b1d3bc662dc356135d7dbb1e218daa..9f9484c1214ce464ff1c0a6dd606288ea785fb23 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 3f9e7dac8155a73da4948068c45e2f8e6914860f..1bf39a83db89fb487230c339e1673083e006a54f 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;