From 0541097a72d148ce6ef1e0cec72ab25e107a1bb5 Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 2 May 2007 16:56:48 +0000 Subject: [PATCH] Updated version of the monitoring (Catalin) --- test/PbPbbench/monrec.C | 9 ++------- test/PbPbbench/monsim.C | 9 ++------- test/ppbench/monrec.C | 9 ++------- test/ppbench/monsim.C | 11 +++-------- 4 files changed, 9 insertions(+), 29 deletions(-) diff --git a/test/PbPbbench/monrec.C b/test/PbPbbench/monrec.C index e8e1de3fdb6..e4182826d98 100644 --- a/test/PbPbbench/monrec.C +++ b/test/PbPbbench/monrec.C @@ -3,13 +3,7 @@ void monrec() { gSystem->Load("libNet.so"); gSystem->Load("libMonaLisa.so"); - SysInfo_t info; - gSystem->GetSysInfo(&info); - - TString platform(info.fOS); - platform += "."; - platform += info.fCpuType; - new TMonaLisaWriter(platform.Data(),"Reconstruction PbPb","aliendb3.cern.ch"); + new TMonaLisaWriter(gSystem->Getenv("TEST_PLATFORMID"),"Reconstruction PbPb","aliendb3.cern.ch"); gROOT->LoadMacro("rec.C"); @@ -30,4 +24,5 @@ void monrec() { gMonitoringWriter->SendParameters(valuelist); delete valuelist; + printf("#Test finished successfully#\n"); } diff --git a/test/PbPbbench/monsim.C b/test/PbPbbench/monsim.C index 82e3365a0b3..f7a828ef4a8 100644 --- a/test/PbPbbench/monsim.C +++ b/test/PbPbbench/monsim.C @@ -3,13 +3,7 @@ void monsim(Int_t nev=1){ gSystem->Load("libNet.so"); gSystem->Load("libMonaLisa.so"); - SysInfo_t info; - gSystem->GetSysInfo(&info); - - TString platform(info.fOS); - platform += "."; - platform += info.fCpuType; - new TMonaLisaWriter(platform.Data(),"Simulation PbPb","aliendb3.cern.ch"); + new TMonaLisaWriter(gSystem->Getenv("TEST_PLATFORMID"),"Simulation PbPb","aliendb3.cern.ch"); gROOT->LoadMacro("sim.C"); sim(nev); @@ -29,4 +23,5 @@ void monsim(Int_t nev=1){ gMonitoringWriter->SendParameters(valuelist); delete valuelist; + printf("#Test finished successfully#\n"); } diff --git a/test/ppbench/monrec.C b/test/ppbench/monrec.C index a8d9a62c365..39b5c487930 100644 --- a/test/ppbench/monrec.C +++ b/test/ppbench/monrec.C @@ -3,13 +3,7 @@ void monrec() { gSystem->Load("libNet.so"); gSystem->Load("libMonaLisa.so"); - SysInfo_t info; - gSystem->GetSysInfo(&info); - - TString platform(info.fOS); - platform += "."; - platform += info.fCpuType; - new TMonaLisaWriter(platform.Data(),"Reconstruction pp","aliendb3.cern.ch"); + new TMonaLisaWriter(gSystem->Getenv("TEST_PLATFORMID"),"Reconstruction pp","aliendb3.cern.ch"); gROOT->LoadMacro("rec.C"); @@ -30,4 +24,5 @@ void monrec() { gMonitoringWriter->SendParameters(valuelist); delete valuelist; + printf("#Test finished successfully#\n"); } diff --git a/test/ppbench/monsim.C b/test/ppbench/monsim.C index b29bfab43b5..99de62cfa69 100644 --- a/test/ppbench/monsim.C +++ b/test/ppbench/monsim.C @@ -3,13 +3,7 @@ void monsim(Int_t nev=20){ gSystem->Load("libNet.so"); gSystem->Load("libMonaLisa.so"); - SysInfo_t info; - gSystem->GetSysInfo(&info); - - TString platform(info.fOS); - platform += "."; - platform += info.fCpuType; - new TMonaLisaWriter(platform.Data(),"Simulation pp","aliendb3.cern.ch"); + new TMonaLisaWriter(gSystem->Getenv("TEST_PLATFORMID"),"Simulation pp","aliendb3.cern.ch"); gROOT->LoadMacro("sim.C"); sim(nev); @@ -29,4 +23,5 @@ void monsim(Int_t nev=20){ gMonitoringWriter->SendParameters(valuelist); delete valuelist; -} + printf("#Test finished successfully#\n"); +} -- 2.39.3