Made the tes suite operatinal again

diff --git a/PHOS/testconfig.C b/PHOS/testconfig.C
index b6995cc23ef703a86d86895d2080f61b3f0c8999..9ae638e9c3035d6039e99a7b7d64df8646e23f66 100644 (file)
--- a/PHOS/testconfig.C
+++ b/PHOS/testconfig.C
@@ -11,12 +11,12 @@ void Config()
   TDatime dat ; 
   gRandom->SetSeed(dat.GetTime());
   
-  new     AliGeant3("C++ Interface to Geant3");
+  gSystem->Load("libgeant321.so") ; 
+  new     TGeant3("C++ Interface to Geant3");
   
   TFile  *rootfile = new TFile("testPHOS.root", "recreate");
   rootfile->SetCompressionLevel(2);
   
-  
   TGeant3 *geant3 = (TGeant3 *) gMC;
   
   //
@@ -92,7 +92,7 @@ void Config()
   
   
   AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
-  AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ;
+  AliPHOSGetter * gime = AliPHOSGetter::GetInstance("aliroot") ;
   AliPHOSQAMeanChecker * hm  = static_cast<AliPHOSQAMeanChecker *>gime->QATasks("HitsMul");
   AliPHOSQAMeanChecker * te  = static_cast<AliPHOSQAMeanChecker *>gime->QATasks("TotEner");
   AliPHOSQAMeanChecker * hmB = static_cast<AliPHOSQAMeanChecker *>gime->QATasks("HitsMulB");
@@ -102,7 +102,7 @@ void Config()
   te->Set(8.092, 3.06) ;
   hmB->Set(63.498, 24.348) ;
   teB->Set(8.363, 3.44) ;
-       
+  hm->Print("") ;      
 }
 
 Float_t EtaToTheta(Float_t arg){

diff --git a/PHOS/testsim.C b/PHOS/testsim.C
index 30378336ace6145f62e503142e527da54110cd23..45726d91224573f944100750b8b9753676acfb4e 100644 (file)
--- a/PHOS/testsim.C
+++ b/PHOS/testsim.C
@@ -1,4 +1,4 @@
-void testsim (Int_t nevent=1, const char *config="testconfig.C")
+void testsim (Int_t nevent=100, const char *config="testconfig.C")
 {
   //
   // Simple macro to run aliroot in a batch mode

diff --git a/PHOS/testsimglobal.C b/PHOS/testsimglobal.C
index 596c822c3e6961f59dbf1195da2d0280c8624c34..7c434fb21ceda877abcaafb6009c77c6fa205f05 100644 (file)
--- a/PHOS/testsimglobal.C
+++ b/PHOS/testsimglobal.C
@@ -138,7 +138,7 @@ Bool_t sim_exam()
   gime->Event(0,"Q") ;
   
   // Examine the alarms
-  TObjArray * alahm = dynamic_cast<TObjArray*>(gime->Alarms()->FindObject("HitsM")) ;
+  TObjArray * alahm = dynamic_cast<TObjArray*>(dynamic_cast<TFolder*>(gime->Alarms())->FindObject("HitsM")) ;
   Float_t ratiohm = 100.0*static_cast<Float_t>(alahm->GetEntries())/static_cast<Float_t>(maxevent) ;
   
   TObjArray * alaet = dynamic_cast<TObjArray*>(gime->Alarms()->FindObject("TotEn")) ;
@@ -179,13 +179,16 @@ Bool_t sim_exam()
   
   if (ratiohm > maxAlaHitsM){
     error = kTRUE ;
-    mess = "Examination detected an error in HitsM." ;
+    mess = "Examination detected an error in HitsM: "; 
+    mess += ratiohm ; 
+    mess += " > " ; 
+    mess += maxAlaHitsM ;  
     write_info(mess) ;
   }
   
   if (ratioet>maxAlaTotEn){
     error = kTRUE ;
-    mess = "Examination detected an error in TotEn." ;
+    sprintf(mess.Data(), "Examination detected an error in TotEn: %f > %f", ratioet, maxAlaTotEn) ;
     write_info(mess) ;
   }
   
@@ -283,7 +286,7 @@ Bool_t sim_exam()
 Bool_t sdigit()
 {
   //SDigits process
-  
+  AliPHOSGetter * gime = AliPHOSGetter::GetInstance("testPHOS.root") ;  
   const Float_t maxSDigits = 62.89 ;
   const Float_t widSDigits = TMath::Sqrt(maxSDigits) ;
 
@@ -291,11 +294,10 @@ Bool_t sdigit()
   TString reconame = "test suite" ;
   
   AliPHOSSDigitizer *sd = new AliPHOSSDigitizer("testPHOS.root",reconame.Data()) ;
-  AliPHOSGetter * gime = AliPHOSGetter::GetInstance() ;
   
   sd->ExecuteTask("deb") ;
   
-  Float_t nSDigits =  static_cast<Float_t>(gime->SDigitizer()->GetSDigitsInRun()) / static_cast<Float_t>(gime->MaxEvent()) ;
+  Float_t nSDigits =  static_cast<Float_t>((dynamic_cast<AliPHOSSDigitizer*>(gime->SDigitizer()))->GetSDigitsInRun()) / static_cast<Float_t>(gime->MaxEvent()) ;
   if ( nSDigits < maxSDigits-widSDigits ||
        nSDigits > maxSDigits+widSDigits ) {
     mess = "Error detected in the SDigits process. Sending error file to PHOS director." ;
@@ -316,7 +318,7 @@ Bool_t digit()
   //Digits process
   AliPHOSGetter * gime = AliPHOSGetter::GetInstance("testPHOS.root") ;
   TString reconame = "test suite" ;
-  const Float_t maxDigits = 2860. ;
+  const Float_t maxDigits = 40. ;
   const Float_t widDigits = TMath::Sqrt(maxDigits) ;
   
   TString mess("") ;
@@ -325,7 +327,7 @@ Bool_t digit()
   
   d->ExecuteTask("deb") ;
   
-  Float_t nDigits = static_cast<Float_t>(gime->Digitizer()->GetDigitsInRun()) / static_cast<Float_t>(gime->MaxEvent()) ;
+  Float_t nDigits = static_cast<Float_t>((dynamic_cast<AliPHOSDigitizer*>(gime->Digitizer()))->GetDigitsInRun()) / static_cast<Float_t>(gime->MaxEvent()) ;
   
   if ( nDigits < maxDigits-widDigits || nDigits > maxDigits+widDigits ) {
     cout <<  "digit() : nDigits = " << nDigits