From 24ae2d25544c31a072942bc6d7ec1f3e68a0c2eb Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Wed, 31 Oct 2007 08:14:00 +0000
Subject: [PATCH] use in TBenchmark the correct benchmark names and not the
 generic "stress".

git-svn-id: http://root.cern.ch/svn/root/trunk@20573 27541ba8-7e3a-0410-8455-c3a389f83636
---
 test/stressFit.cxx      | 9 ++++-----
 test/stressGraphics.cxx | 8 ++++----
 test/stressLinear.cxx   | 8 ++++----
 test/stressShapes.cxx   | 2 ++
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/test/stressFit.cxx b/test/stressFit.cxx
index d7e9be71ba2..58522ce7995 100644
--- a/test/stressFit.cxx
+++ b/test/stressFit.cxx
@@ -613,7 +613,7 @@ Int_t stressFit(const char *theFitter, Int_t N)
   cout << "*  Starting  S T R E S S  with fitter : "<<TVirtualFitter::GetDefaultFitter() <<endl;
   cout << "******************************************************************" <<endl;
 
-  gBenchmark->Start("StressFit");
+  gBenchmark->Start("stressFit");
 
   Bool_t okRosenBrock    = kTRUE;
   Bool_t okWood          = kTRUE;
@@ -638,7 +638,7 @@ Int_t stressFit(const char *theFitter, Int_t N)
   okTrigoFletcher = RunTrigoFletcher();
   StatusPrint(7,"TrigoFletcher",okTrigoFletcher);
 
-  gBenchmark->Stop("StressFit");
+  gBenchmark->Stop("stressFit");
 
 
   //Print table with results
@@ -657,20 +657,19 @@ Int_t stressFit(const char *theFitter, Int_t N)
   }
   
   printf("******************************************************************\n");
-  gBenchmark->Print("StressFit");
+  gBenchmark->Print("stressFit");
 #ifdef __CINT__
   Double_t reftime = 86.34; //macbrun interpreted
 #else
   Double_t reftime = 12.07; //macbrun compiled
 #endif
-  const Double_t rootmarks = 800*reftime/gBenchmark->GetCpuTime("StressFit");
+  const Double_t rootmarks = 800.*reftime/gBenchmark->GetCpuTime("stressFit");
   
   printf("******************************************************************\n");
   printf("*  ROOTMARKS =%6.1f   *  Root%-8s  %d/%d\n",rootmarks,gROOT->GetVersion(),
          gROOT->GetVersionDate(),gROOT->GetVersionTime());
   printf("******************************************************************\n");
 
-  printf("Time at the end of job = %f seconds\n",timer.CpuTime());
    return 0;
 }
 
diff --git a/test/stressGraphics.cxx b/test/stressGraphics.cxx
index 3e18507c092..27bc30438b2 100644
--- a/test/stressGraphics.cxx
+++ b/test/stressGraphics.cxx
@@ -188,7 +188,7 @@ void stressGraphics(Int_t verbose)
    gTestNum = 0;
    gC       = 0;
 
-   gBenchmark->Start("stress");
+   gBenchmark->Start("stressGraphics");
 
    if (!gOptionR) {
       cout << "*  Starting Basic Graphics - S T R E S S                         *" <<endl;
@@ -245,7 +245,7 @@ void stressGraphics(Int_t verbose)
    if (!gOptionR) {
       cout << "******************************************************************" <<endl;
 
-      gBenchmark->Stop("stress");
+      gBenchmark->Stop("stressGraphics");
 
       //Print table with results
       Bool_t UNIX = strcmp(gSystem->GetName(), "Unix") == 0;
@@ -263,9 +263,9 @@ void stressGraphics(Int_t verbose)
 
       printf("******************************************************************\n");
       printf("* ");
-      gBenchmark->Print("stress");
+      gBenchmark->Print("stressGraphics");
 
-      Double_t ct = gBenchmark->GetCpuTime("stress");
+      Double_t ct = gBenchmark->GetCpuTime("stressGraphics");
       const Double_t rootmarks = 600*(4.85/ct);
 
       printf("******************************************************************\n");
diff --git a/test/stressLinear.cxx b/test/stressLinear.cxx
index b203a3efea6..6b83dc493a4 100644
--- a/test/stressLinear.cxx
+++ b/test/stressLinear.cxx
@@ -204,7 +204,7 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
 
   gVerbose = verbose;
 
-  gBenchmark->Start("stress");
+  gBenchmark->Start("stressLinear");
 
   gNrLoop = nrSize-1;
   while (gNrLoop > 0 && maxSizeReq < gSizeA[gNrLoop])
@@ -286,7 +286,7 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
     cout << "******************************************************************" <<endl;
   }
 
-  gBenchmark->Stop("stress");
+  gBenchmark->Stop("stressLinear");
 
   //Print table with results
   Bool_t UNIX = strcmp(gSystem->GetName(), "Unix") == 0;
@@ -304,13 +304,13 @@ void stressLinear(Int_t maxSizeReq,Int_t verbose)
   }
 
   printf("******************************************************************\n");
-  gBenchmark->Print("stress");
+  gBenchmark->Print("stressLinear");
   const Int_t nr = 7;
   const Double_t x_b12[] = { 10.,   30.,   50.,   100.,  300.,  500.,    700.};
   const Double_t y_b12[] = {10.74, 15.72, 20.00, 35.79, 98.77, 415.34, 1390.33};
 
   TGraph gr(nr,x_b12,y_b12);
-  Double_t ct = gBenchmark->GetCpuTime("stress");
+  Double_t ct = gBenchmark->GetCpuTime("stressLinear");
   const Double_t rootmarks = 600*gr.Eval(maxSize)/ct;
 
   printf("******************************************************************\n");
diff --git a/test/stressShapes.cxx b/test/stressShapes.cxx
index b49f76f5b54..35b45995805 100644
--- a/test/stressShapes.cxx
+++ b/test/stressShapes.cxx
@@ -307,7 +307,9 @@ TGeoMedium *med16 = new TGeoMedium("RHONEYCM",16,16,0,0,0,20,0.1000000E+11,0.212
    length();
 
    // print ROOTMARKs
+   printf("\n");
    gBenchmark->Stop("stressShapes");
+   gBenchmark->Print("stressShapes");
    Float_t ct = gBenchmark->GetCpuTime("stressShapes");
 #ifdef __CINT__
    Float_t cp_brun = 310.47;
-- 
GitLab