From 69c46d164120d317cc2efc8442de3a56a6d47995 Mon Sep 17 00:00:00 2001 From: schutz Date: Wed, 17 Oct 2001 15:21:23 +0000 Subject: [PATCH] The test suite was modified to add the mel recipeint. The Makefile has a fast (make test10) and slow (make test) test. --- PHOS/Makefile | 21 +++++++++++++-------- PHOS/testconfig.C | 6 +++--- PHOS/testsimglobal.C | 6 +++--- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/PHOS/Makefile b/PHOS/Makefile index 19431febf1b..4119e28fca1 100644 --- a/PHOS/Makefile +++ b/PHOS/Makefile @@ -12,7 +12,7 @@ PACKAGE = PHOS SRCS = AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx \ AliPHOSvFast.cxx AliPHOSvImpacts.cxx \ AliPHOSImpact.cxx \ - AliPHOSHit.cxx \ + AliPHOSHit.cxx AliPHOSTick.cxx\ AliPHOSGeometry.cxx \ AliPHOSEMCAGeometry.cxx \ AliPHOSCPVGeometry.cxx AliPHOSCPVBaseGeometry.cxx \ @@ -29,10 +29,7 @@ SRCS = AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx \ AliPHOSGetter.cxx AliPHOSTick.cxx \ AliPHOSQAVirtualCheckable.cxx AliPHOSQAIntCheckable.cxx \ AliPHOSQAFloatCheckable.cxx\ - AliPHOSQAObjectCheckable.cxx AliPHOSQAChecker.cxx AliPHOSQAMeanChecker.cxx AliPHOSQAAlarm.cxx \ - AliPHOSIhepAnalyze.cxx AliPHOSEvalRecPoint.cxx \ - AliPHOSRecManager.cxx AliPHOSRecCpvManager.cxx AliPHOSRecEmcManager.cxx \ - AliPHOSClusterizerv2.cxx + AliPHOSQAObjectCheckable.cxx AliPHOSQAChecker.cxx AliPHOSQAMeanChecker.cxx AliPHOSQAAlarm.cxx # C++ Headers @@ -80,18 +77,26 @@ include $(ALICE_ROOT)/conf/GeneralMacros -include tgt_$(ALICE_TARGET)/Make-depend + test: @echo " ____________________________________________________________ " @echo " " @echo " Starting the test of the simulation/reconstruction software. Please don't take the warning messages into account. " @echo " ____________________________________________________________ " - @aliroot -b -q testsim.C > out + @aliroot -b -q "testsim.C(100)" > out @aliroot -b -q testsimglobal.C > out @rm out @rm testPHOS.root - - +test10: + @echo " ____________________________________________________________ " + @echo " " + @echo " Starting the test of the simulation/reconstruction software. Please don't take the warning messages into account. " + @echo " ____________________________________________________________ " + @aliroot -b -q "testsim.C(10)" > out + @aliroot -b -q testsimglobal.C > out + @rm out + @rm testPHOS.root diff --git a/PHOS/testconfig.C b/PHOS/testconfig.C index adc48e40a20..b6995cc23ef 100644 --- a/PHOS/testconfig.C +++ b/PHOS/testconfig.C @@ -70,10 +70,10 @@ void Config() gener->SetPart(22) ; gener->SetPtRange(9.99, 10.00); - gener->SetPhiRange(250, 290); //(220, 320); + gener->SetPhiRange(220, 320); // Set pseudorapidity range from -8 to 8. - Float_t thmin = EtaToTheta(0.02); //(0.12); // 220 theta min. <---> eta max - Float_t thmax = EtaToTheta(-0.02); //(-0.12); // 320 theta max. <---> eta min + Float_t thmin = EtaToTheta(0.12); // 220 theta min. <---> eta max + Float_t thmax = EtaToTheta(-0.12); // 320 theta max. <---> eta min gener->SetThetaRange(thmin, thmax); gener->SetOrigin(0, 0, 0); //vertex position diff --git a/PHOS/testsimglobal.C b/PHOS/testsimglobal.C index 608d7b7cdfa..8b2e6c81598 100644 --- a/PHOS/testsimglobal.C +++ b/PHOS/testsimglobal.C @@ -103,7 +103,7 @@ void testsimglobal() write_info(mess) ; } else { - gSystem->Exec("uuencode $ALICE_ROOT/PHOS/testPHOS.root testPHOS.root | mail -s 'PHOS INSTALLATION ERROR' almajor@caramail.com") ; + gSystem->Exec("uuencode $ALICE_ROOT/PHOS/testPHOS.root testPHOS.root | mail -s 'PHOS INSTALLATION ERROR' schutz@in2p3.fr") ; mess = "Error message to PHOS director has been sent, please wait for his answer before launching the whole simulation again." ; write_info(mess) ; } @@ -160,13 +160,13 @@ Bool_t sim_exam() if (ratiohmb[i] > maxAlaHitsMB){ error = kTRUE ; - mess = "Examination detected an error in " + TString((const char *)namemul) ; + mess = "Examination detected an error in " + TString(namemul) ; write_info(mess) ; } if (ratioenb[i] > maxAlaTotEnB) { error = kTRUE ; - mess = "Examination detected an error in " + TString((const char *)namen) ; + mess = "Examination detected an error in " + TString(namen) ; write_info(mess) ; } } -- 2.31.1