Improve timing messages

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index fd5096f4a49251d05e0a997c6a8dcfe6e7e7a235..c584db8d12fcb76471b917d97ea3eef6dba78955 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -445,8 +445,9 @@ Bool_t AliReconstruction::RunLocalReconstruction(const TString& detectors)
     } else {
       reconstructor->Reconstruct(fRunLoader);
     }
-    AliInfo(Form("execution time for %s:", fgkDetectorName[iDet]));
-    ToAliInfo(stopwatchDet.Print());
+    AliInfo(Form("Execution time for %s: R:%.2fs C:%.2fs",
+                fgkDetectorName[iDet],
+                stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
   }
 
   if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
@@ -455,8 +456,8 @@ Bool_t AliReconstruction::RunLocalReconstruction(const TString& detectors)
     if (fStopOnError) return kFALSE;
   }
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -489,8 +490,9 @@ Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors)
       reconstructor->ConvertDigits(fRawReader, digitsTree);
       loader->WriteDigits("OVERWRITE");
       loader->UnloadDigits();
-      AliDebug(1, Form("execution time for %s:", fgkDetectorName[iDet]));
-      ToAliDebug(1, stopwatchDet.Print());
+      AliInfo(Form("Execution time for %s: R:%.2fs C:%.2fs",
+                  fgkDetectorName[iDet],
+                  stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
     }
 
     // local reconstruction
@@ -517,8 +519,9 @@ Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors)
     }
     loader->WriteRecPoints("OVERWRITE");
     loader->UnloadRecPoints();
-    AliDebug(1, Form("execution time for %s:", fgkDetectorName[iDet]));
-    ToAliDebug(1, stopwatchDet.Print());
+    AliDebug(1,Form("Execution time for %s: R:%.2fs C:%.2fs",
+                   fgkDetectorName[iDet],
+                   stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
   }
 
   if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
@@ -526,9 +529,9 @@ Bool_t AliReconstruction::RunLocalEventReconstruction(const TString& detectors)
                   detStr.Data()));
     if (fStopOnError) return kFALSE;
   }
-
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -581,8 +584,8 @@ Bool_t AliReconstruction::RunVertexFinder(AliESD*& esd)
   }  
   delete vertex;
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -640,8 +643,8 @@ Bool_t AliReconstruction::RunHLTTracking(AliESD*& esd)
     delete tracker;
   }
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -747,8 +750,8 @@ Bool_t AliReconstruction::RunTracking(AliESD*& esd)
     fLoader[iDet]->UnloadRecPoints();
   }
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -815,8 +818,8 @@ Bool_t AliReconstruction::FillESD(AliESD*& esd, const TString& detectors)
     if (fStopOnError) return kFALSE;
   }
 
-  AliInfo("execution time:");
-  ToAliInfo(stopwatch.Print());
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 1541807b308b605a200366aebb391810a9a22a98..85db124b373ea3e2f989cef92512fe5eee81b59c 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -403,8 +403,8 @@ Bool_t AliSimulation::RunSimulation(Int_t nEvents)
 
   delete runLoader;
 
-  AliInfo("execution time:");
-  StdoutToAliInfo(stopwatch.Print(););
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -430,8 +430,8 @@ Bool_t AliSimulation::RunSDigitization(const char* detectors)
       TStopwatch stopwatchDet;
       stopwatchDet.Start();
       det->Hits2SDigits();
-      AliInfo(Form("execution time for %s:", det->GetName()));
-      StdoutToAliInfo(stopwatchDet.Print(););
+      AliInfo(Form("Execution time for %s: R:%.2fs C:%.2fs",
+          det->GetName(),stopwatchDet.RealTime(),stopwatchDet.CpuTime()));
     }
   }
 
@@ -443,8 +443,8 @@ Bool_t AliSimulation::RunSDigitization(const char* detectors)
 
   delete runLoader;
 
-  AliInfo("execution time:");
-  StdoutToAliInfo(stopwatch.Print(););
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+          stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -508,9 +508,9 @@ Bool_t AliSimulation::RunDigitization(const char* detectors,
 
   delete manager;
 
-  AliInfo("execution time:");
-  StdoutToAliInfo(stopwatch.Print(););
-
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
+  
   return kTRUE;
 }
 
@@ -546,8 +546,8 @@ Bool_t AliSimulation::RunHitsDigitization(const char* detectors)
   //PH Temporary fix to avoid interference with the PHOS loder/getter
   //PH The problem has to be solved in more general way 09/06/05
 
-  AliInfo("execution time:");
-  StdoutToAliInfo(stopwatch.Print(););
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }
@@ -600,8 +600,8 @@ Bool_t AliSimulation::WriteRawData(const char* detectors,
     }
   }
 
-  AliInfo("execution time:");
-  StdoutToAliInfo(stopwatch.Print(););
+  AliInfo(Form("Execution time: R:%.2fs C:%.2fs",
+              stopwatch.RealTime(),stopwatch.CpuTime()));
 
   return kTRUE;
 }