Merge pull request #536 from rest-for-physics/lobis-feminos-daq-to-raw

Minor variable renaming
rest-for-physics · Aug 19, 2024 · 907e693 · 907e693
2 parents 225f32c + 037c178
commit 907e693
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/source/framework/analysis/src/TRestEventRateAnalysisProcess.cxx b/source/framework/analysis/src/TRestEventRateAnalysisProcess.cxx
@@ -65,7 +65,7 @@
 ///
 /// <hr>
 ///
-/// \warning **⚠ REST is under continous development.** This documentation
+/// \warning **⚠ REST is under continuous development.** This documentation
 /// is offered to you by the REST community. Your HELP is needed to keep this
 /// code up to date. Your feedback will be worth to support this software, please
 /// report any problems/suggestions you may find will using it at [The REST Framework

diff --git a/source/framework/analysis/src/TRestEventSelectionProcess.cxx b/source/framework/analysis/src/TRestEventSelectionProcess.cxx
@@ -46,7 +46,7 @@
 ///
 /// <hr>
 ///
-/// \warning ** REST is under continous development.** This documentation
+/// \warning ** REST is under continuous development.** This documentation
 /// is offered to you by the REST community. Your HELP is needed to keep this code
 /// up to date. Your feedback will be worth to support this software, please report
 /// any problems/suggestions you may find while using it at [The REST Framework

diff --git a/source/framework/core/src/TRestProcessRunner.cxx b/source/framework/core/src/TRestProcessRunner.cxx
@@ -52,14 +52,14 @@ high_resolution_clock::time_point tS, tE;
 #endif
 
 int ncalculated = 10;
-Long64_t bytesReaded_last = 0;
-Double_t prog_last = 0;
-Int_t prog_last_printed = 0;
+Long64_t bytesReadLast = 0;
+Double_t progressLast = 0;
+Int_t progressLastPrinted = 0;
 vector<Long64_t> bytesAdded(ncalculated, 0);
 vector<Double_t> progAdded(ncalculated, 0);
-int poscalculated = 0;
+int positionCalculated = 0;
 int printInterval = 200000;  // 0.2s
-int inputtreeentries = 0;
+int inputTreeEntries = 0;
 
 ClassImp(TRestProcessRunner);
 
@@ -428,7 +428,7 @@ void TRestProcessRunner::RunProcess() {
     fProcessedEvents = 0;
     fRunInfo->ResetEntry();
     fRunInfo->SetCurrentEntry(fFirstEntry);
-    inputtreeentries = fRunInfo->GetEntries();
+    inputTreeEntries = fRunInfo->GetEntries();
 
     // set root mutex
     //!!!!!!!!!!!!Important!!!!!!!!!!!!
@@ -1098,7 +1098,7 @@ void TRestProcessRunner::PrintProcessedEvents(Int_t rateE) {
         } else if (fEventsToProcess == REST_MAXIMUM_EVENTS)
         // Nevents is unknown, reading root file
         {
-            prog = fRunInfo->GetCurrentEntry() / (double)inputtreeentries * 100;
+            prog = fRunInfo->GetCurrentEntry() / (double)inputTreeEntries * 100;
         } else {
             prog = fProcessedEvents / (double)fEventsToProcess * 100;
         }
@@ -1113,9 +1113,9 @@ void TRestProcessRunner::PrintProcessedEvents(Int_t rateE) {
         string s1(buffer);
 
         if (fProcStatus == kNormal) {
-            sprintf(buffer, "%.1f min ETA, (Pause: \"p\") ", (100 - prog_last) / progspeed / 60);
+            sprintf(buffer, "%.1f min ETA, (Pause: \"p\") ", (100 - progressLast) / progspeed / 60);
         } else {
-            sprintf(buffer, "%.1f min ETA, (Pause Disabled) ", (100 - prog_last) / progspeed / 60);
+            sprintf(buffer, "%.1f min ETA, (Pause Disabled) ", (100 - progressLast) / progspeed / 60);
         }
         string s2(buffer);
 
@@ -1131,22 +1131,22 @@ void TRestProcessRunner::PrintProcessedEvents(Int_t rateE) {
         delete[] buffer;
 
         if (REST_Display_CompatibilityMode) {
-            if (((int)prog) != prog_last_printed) {
+            if (((int)prog) != progressLastPrinted) {
                 cout << s1 << s2 << s3 << endl;
-                prog_last_printed = (int)prog;
+                progressLastPrinted = (int)prog;
             }
         } else if (fThreads[0]->GetVerboseLevel() < TRestStringOutput::REST_Verbose_Level::REST_Debug) {
             printf("%s", (s1 + s2 + s3 + "\r").c_str());
             fflush(stdout);
         }
 
-        bytesAdded[poscalculated] = fRunInfo->GetBytesRead() - bytesReaded_last;
-        bytesReaded_last = fRunInfo->GetBytesRead();
-        progAdded[poscalculated] = prog - prog_last;
-        prog_last = prog;
+        bytesAdded[positionCalculated] = fRunInfo->GetBytesRead() - bytesReadLast;
+        bytesReadLast = fRunInfo->GetBytesRead();
+        progAdded[positionCalculated] = prog - progressLast;
+        progressLast = prog;
 
-        poscalculated++;
-        if (poscalculated >= ncalculated) poscalculated -= ncalculated;
+        positionCalculated++;
+        if (positionCalculated >= ncalculated) positionCalculated -= ncalculated;
     }
 }