Removing obsolete macros, changes to work with the trunk, clean-up

diff --git a/test/generators/TUHKMgen/Config.C b/test/generators/TUHKMgen/Config.C
index 81435e7..aaa204d 100644 (file)
--- a/test/generators/TUHKMgen/Config.C
+++ b/test/generators/TUHKMgen/Config.C
@@ -124,7 +124,7 @@ void Config()
 
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //
@@ -260,7 +260,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-  FRAME->SetHoles(1);
+       FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -282,7 +282,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-  AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
     }
 
     if (iTPC)
@@ -294,8 +294,8 @@ void Config()
 
     if (iTOF) {
         //=================== TOF parameters ============================
-  AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
-    }
+       AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
+     }
 
 
     if (iHMPID)
@@ -318,19 +318,33 @@ void Config()
         //=================== TRD parameters ============================
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
+        AliTRDgeometry *geoTRD = TRD->GetGeometry();
+       // Partial geometry: modules at 0,1,7,8,9,10,17
+       // starting at 3h in positive direction
+       geoTRD->SetSMstatus(2,0);
+       geoTRD->SetSMstatus(3,0);
+       geoTRD->SetSMstatus(4,0);
+        geoTRD->SetSMstatus(5,0);
+       geoTRD->SetSMstatus(6,0);
+        geoTRD->SetSMstatus(11,0);
+        geoTRD->SetSMstatus(12,0);
+        geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(14,0);
+        geoTRD->SetSMstatus(15,0);
+        geoTRD->SetSMstatus(16,0);
     }
 
     if (iFMD)
     {
         //=================== FMD parameters ============================
-  AliFMD *FMD = new AliFMDv1("FMD", "normal FMD");
+       AliFMD *FMD = new AliFMDv1("FMD", "normal FMD");
    }
 
     if (iMUON)
     {
         //=================== MUON parameters ===========================
         // New MUONv1 version (geometry defined via builders)
-        AliMUON *MUON = new AliMUONv1("MUON", "default");
+        AliMUON *MUON = new AliMUONv1("MUON","default");
     }
     //=================== PHOS parameters ===========================
 

diff --git a/test/generators/TUHKMgen/aod.C b/test/generators/TUHKMgen/aod.C
deleted file mode 100644 (file)
index a87c0b3..0000000
--- a/test/generators/TUHKMgen/aod.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void aod(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CreateAODfromESD.C");
-}

diff --git a/test/generators/TUHKMgen/check.C b/test/generators/TUHKMgen/check.C
deleted file mode 100644 (file)
index 5f336be..0000000
--- a/test/generators/TUHKMgen/check.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void check(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CheckESD.C");
-}

diff --git a/test/generators/TUHKMgen/monrec.C b/test/generators/TUHKMgen/monrec.C
deleted file mode 100644 (file)
index c6f1330..0000000
--- a/test/generators/TUHKMgen/monrec.C
+++ /dev/null
@@ -1,28 +0,0 @@
-void monrec() {
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Reconstruction pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-
-  gROOT->LoadMacro("rec.C");
-  rec();
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the AliESDs.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./AliESDs.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("AliESDs.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/TUHKMgen/monsim.C b/test/generators/TUHKMgen/monsim.C
deleted file mode 100644 (file)
index fcc88ff..0000000
--- a/test/generators/TUHKMgen/monsim.C
+++ /dev/null
@@ -1,27 +0,0 @@
-void monsim(Int_t nev=20){ 
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Simulation pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-  gROOT->LoadMacro("sim.C");
-  sim(nev);
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the raw.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./raw.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("raw.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/TUHKMgen/rec.C b/test/generators/TUHKMgen/rec.C
index ebed8d3..e576eac 100644 (file)
--- a/test/generators/TUHKMgen/rec.C
+++ b/test/generators/TUHKMgen/rec.C
@@ -1,10 +1,4 @@
 void rec() {
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibsrec.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
   AliReconstruction reco;
 
   reco.SetWriteESDfriend();
@@ -14,11 +8,6 @@ void rec() {
   reco.SetSpecificStorage("GRP/GRP/Data",
                          Form("local://%s",gSystem->pwd()));
 
-  AliGRPRecoParam *grpRecoParam = AliGRPRecoParam::GetLowFluxParam();
-  grpRecoParam->SetVertexerTracksConstraintITS(kFALSE);
-  grpRecoParam->SetVertexerTracksConstraintTPC(kFALSE);
-  reco.SetRecoParam("GRP",grpRecoParam);
-
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/generators/TUHKMgen/runtest.sh b/test/generators/TUHKMgen/runtest.sh
index 4b69e14..856dcc5 100755 (executable)
--- a/test/generators/TUHKMgen/runtest.sh
+++ b/test/generators/TUHKMgen/runtest.sh
@@ -21,10 +21,6 @@ mv syswatch.log recwatch.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
-cd recraw
-ln -s ../raw.root
-aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 

diff --git a/test/generators/TUHKMgen/testvert.C b/test/generators/TUHKMgen/testvert.C
deleted file mode 100644 (file)
index dab13a7..0000000
--- a/test/generators/TUHKMgen/testvert.C
+++ /dev/null
@@ -1,25 +0,0 @@
-void testvert() {
-
-  TFile f("AliESDs.root");
-
-  TTree * tree = (TTree*)f.Get("esdTree");
-
-  AliESDEvent * esd = new AliESDEvent();// The signal ESD object is put here
-  esd->ReadFromTree(tree);
-
-  Int_t nev = tree->GetEntriesFast();
-  
-  for (Int_t iev=0; iev<nev; iev++) {
-    cout << "---------- Signal event ----------" << iev << endl;
-
-    // Get ESD
-    tree->GetEntry(iev);
-
-    AliESDVertex * vert = esd->GetPrimaryVertex();
-
-    if (vert) cout << vert->GetTitle() << endl;
-
-    if (strstr(vert->GetTitle(),"VertexerTracks")) cout << "OK" << endl;
-
-  }
-}

diff --git a/test/generators/epos/Config.C b/test/generators/epos/Config.C
index 3ec4b16..0be7fbc 100644 (file)
--- a/test/generators/epos/Config.C
+++ b/test/generators/epos/Config.C
@@ -125,7 +125,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
     cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
     //
@@ -231,7 +231,6 @@ void Config()
     //=================== Alice BODY parameters =============================
     AliBODY *BODY = new AliBODY("BODY", "Alice envelop");
 
-
     if (iMAG)
     {
         //=================== MAG parameters ============================
@@ -294,7 +293,7 @@ void Config()
 
     if (iTPC)
     {
-      //============================ TPC parameters =====================
+        //============================ TPC parameters ===================
         AliTPC *TPC = new AliTPCv2("TPC", "Default");
     }
 
@@ -302,7 +301,7 @@ void Config()
     if (iTOF) {
         //=================== TOF parameters ============================
        AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
-    }
+     }
 
 
     if (iHMPID)
@@ -325,6 +324,20 @@ void Config()
         //=================== TRD parameters ============================
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
+        AliTRDgeometry *geoTRD = TRD->GetGeometry();
+       // Partial geometry: modules at 0,1,7,8,9,10,17
+       // starting at 3h in positive direction
+       geoTRD->SetSMstatus(2,0);
+       geoTRD->SetSMstatus(3,0);
+       geoTRD->SetSMstatus(4,0);
+        geoTRD->SetSMstatus(5,0);
+       geoTRD->SetSMstatus(6,0);
+        geoTRD->SetSMstatus(11,0);
+        geoTRD->SetSMstatus(12,0);
+        geoTRD->SetSMstatus(13,0);
+        geoTRD->SetSMstatus(14,0);
+        geoTRD->SetSMstatus(15,0);
+        geoTRD->SetSMstatus(16,0);
     }
 
     if (iFMD)
@@ -337,7 +350,7 @@ void Config()
     {
         //=================== MUON parameters ===========================
         // New MUONv1 version (geometry defined via builders)
-        AliMUON *MUON = new AliMUONv1("MUON", "default");
+        AliMUON *MUON = new AliMUONv1("MUON","default");
     }
     //=================== PHOS parameters ===========================
 

diff --git a/test/generators/epos/aod.C b/test/generators/epos/aod.C
deleted file mode 100644 (file)
index a87c0b3..0000000
--- a/test/generators/epos/aod.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void aod(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CreateAODfromESD.C");
-}

diff --git a/test/generators/epos/check.C b/test/generators/epos/check.C
deleted file mode 100644 (file)
index 5f336be..0000000
--- a/test/generators/epos/check.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void check(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CheckESD.C");
-}

diff --git a/test/generators/epos/monrec.C b/test/generators/epos/monrec.C
deleted file mode 100644 (file)
index c6f1330..0000000
--- a/test/generators/epos/monrec.C
+++ /dev/null
@@ -1,28 +0,0 @@
-void monrec() {
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Reconstruction pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-
-  gROOT->LoadMacro("rec.C");
-  rec();
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the AliESDs.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./AliESDs.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("AliESDs.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/epos/monsim.C b/test/generators/epos/monsim.C
deleted file mode 100644 (file)
index fcc88ff..0000000
--- a/test/generators/epos/monsim.C
+++ /dev/null
@@ -1,27 +0,0 @@
-void monsim(Int_t nev=20){ 
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Simulation pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-  gROOT->LoadMacro("sim.C");
-  sim(nev);
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the raw.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./raw.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("raw.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/epos/rec.C b/test/generators/epos/rec.C
index ebed8d3..e576eac 100644 (file)
--- a/test/generators/epos/rec.C
+++ b/test/generators/epos/rec.C
@@ -1,10 +1,4 @@
 void rec() {
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibsrec.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
   AliReconstruction reco;
 
   reco.SetWriteESDfriend();
@@ -14,11 +8,6 @@ void rec() {
   reco.SetSpecificStorage("GRP/GRP/Data",
                          Form("local://%s",gSystem->pwd()));
 
-  AliGRPRecoParam *grpRecoParam = AliGRPRecoParam::GetLowFluxParam();
-  grpRecoParam->SetVertexerTracksConstraintITS(kFALSE);
-  grpRecoParam->SetVertexerTracksConstraintTPC(kFALSE);
-  reco.SetRecoParam("GRP",grpRecoParam);
-
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/generators/epos/runtest.sh b/test/generators/epos/runtest.sh
index 4b69e14..046aabd 100755 (executable)
--- a/test/generators/epos/runtest.sh
+++ b/test/generators/epos/runtest.sh
@@ -21,10 +21,5 @@ mv syswatch.log recwatch.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
-cd recraw
-ln -s ../raw.root
-aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
-
 
 

diff --git a/test/generators/epos/testvert.C b/test/generators/epos/testvert.C
deleted file mode 100644 (file)
index dab13a7..0000000
--- a/test/generators/epos/testvert.C
+++ /dev/null
@@ -1,25 +0,0 @@
-void testvert() {
-
-  TFile f("AliESDs.root");
-
-  TTree * tree = (TTree*)f.Get("esdTree");
-
-  AliESDEvent * esd = new AliESDEvent();// The signal ESD object is put here
-  esd->ReadFromTree(tree);
-
-  Int_t nev = tree->GetEntriesFast();
-  
-  for (Int_t iev=0; iev<nev; iev++) {
-    cout << "---------- Signal event ----------" << iev << endl;
-
-    // Get ESD
-    tree->GetEntry(iev);
-
-    AliESDVertex * vert = esd->GetPrimaryVertex();
-
-    if (vert) cout << vert->GetTitle() << endl;
-
-    if (strstr(vert->GetTitle(),"VertexerTracks")) cout << "OK" << endl;
-
-  }
-}

diff --git a/test/generators/herwig/Config.C b/test/generators/herwig/Config.C
index 842bca8..5554f12 100644 (file)
--- a/test/generators/herwig/Config.C
+++ b/test/generators/herwig/Config.C
@@ -134,7 +134,7 @@ void Config()
   gAlice->SetRunLoader(rl);
 
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+  AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
   cout << "Trigger configuration is set to  " << pprTrigConfName[strig] << endl;
 
   //
@@ -394,23 +394,6 @@ void Config()
     //=================== PHOS parameters ===========================
 
     AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
-    //Set simulation parameters different from the default ones.
-    AliPHOSSimParam* simEmc = AliPHOSSimParam::GetInstance();
-
-    // APD noise of warm (+20C) PHOS:
-    // a2 = a1*(Y1/Y2)*(M1/M2), where a1 = 0.012 is APD noise at -25C,
-    // Y1 = 4.3 photo-electrons/MeV, Y2 = 1.7 p.e/MeV - light yields at -25C and +20C,
-    // M1 = 50, M2 = 50 - APD gain factors chosen for t1 = -25C and t2 = +20C,
-    // Y = MeanLightYield*APDEfficiency.
-
-    Float_t apdNoise = 0.012 * 2.5;
-    simEmc->SetAPDNoise(apdNoise);
-
-    //Raw Light Yield at +20C
-    simEmc->SetMeanLightYield(18800);
-
-    //ADC channel width at +18C.
-    simEmc->SetADCchannelW(0.0125);
   }
 
   if (iPMD)

diff --git a/test/generators/herwig/aod.C b/test/generators/herwig/aod.C
deleted file mode 100644 (file)
index a87c0b3..0000000
--- a/test/generators/herwig/aod.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void aod(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CreateAODfromESD.C");
-}

diff --git a/test/generators/herwig/check.C b/test/generators/herwig/check.C
deleted file mode 100644 (file)
index 5f336be..0000000
--- a/test/generators/herwig/check.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void check(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CheckESD.C");
-}

diff --git a/test/generators/herwig/monrec.C b/test/generators/herwig/monrec.C
deleted file mode 100644 (file)
index c6f1330..0000000
--- a/test/generators/herwig/monrec.C
+++ /dev/null
@@ -1,28 +0,0 @@
-void monrec() {
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Reconstruction pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-
-  gROOT->LoadMacro("rec.C");
-  rec();
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the AliESDs.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./AliESDs.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("AliESDs.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/herwig/monsim.C b/test/generators/herwig/monsim.C
deleted file mode 100644 (file)
index fcc88ff..0000000
--- a/test/generators/herwig/monsim.C
+++ /dev/null
@@ -1,27 +0,0 @@
-void monsim(Int_t nev=20){ 
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Simulation pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-  gROOT->LoadMacro("sim.C");
-  sim(nev);
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the raw.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./raw.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("raw.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/herwig/runtest.sh b/test/generators/herwig/runtest.sh
index 4b69e14..856dcc5 100755 (executable)
--- a/test/generators/herwig/runtest.sh
+++ b/test/generators/herwig/runtest.sh
@@ -21,10 +21,6 @@ mv syswatch.log recwatch.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
-cd recraw
-ln -s ../raw.root
-aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 

diff --git a/test/generators/herwig/testvert.C b/test/generators/herwig/testvert.C
deleted file mode 100644 (file)
index dab13a7..0000000
--- a/test/generators/herwig/testvert.C
+++ /dev/null
@@ -1,25 +0,0 @@
-void testvert() {
-
-  TFile f("AliESDs.root");
-
-  TTree * tree = (TTree*)f.Get("esdTree");
-
-  AliESDEvent * esd = new AliESDEvent();// The signal ESD object is put here
-  esd->ReadFromTree(tree);
-
-  Int_t nev = tree->GetEntriesFast();
-  
-  for (Int_t iev=0; iev<nev; iev++) {
-    cout << "---------- Signal event ----------" << iev << endl;
-
-    // Get ESD
-    tree->GetEntry(iev);
-
-    AliESDVertex * vert = esd->GetPrimaryVertex();
-
-    if (vert) cout << vert->GetTitle() << endl;
-
-    if (strstr(vert->GetTitle(),"VertexerTracks")) cout << "OK" << endl;
-
-  }
-}

diff --git a/test/generators/therminator/Config.C b/test/generators/therminator/Config.C
index 0d191a7..bd68b55 100644 (file)
--- a/test/generators/therminator/Config.C
+++ b/test/generators/therminator/Config.C
@@ -140,7 +140,7 @@ void Config()
   gAlice->SetRunLoader(rl);
 
   // Set the trigger configuration: proton-proton
-  gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+  AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]);
   cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
 
   //
@@ -400,23 +400,6 @@ void Config()
     //=================== PHOS parameters ===========================
 
     AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP");
-    //Set simulation parameters different from the default ones.
-    AliPHOSSimParam* simEmc = AliPHOSSimParam::GetInstance();
-
-    // APD noise of warm (+20C) PHOS:
-    // a2 = a1*(Y1/Y2)*(M1/M2), where a1 = 0.012 is APD noise at -25C,
-    // Y1 = 4.3 photo-electrons/MeV, Y2 = 1.7 p.e/MeV - light yields at -25C and +20C,
-    // M1 = 50, M2 = 50 - APD gain factors chosen for t1 = -25C and t2 = +20C,
-    // Y = MeanLightYield*APDEfficiency.
-
-    Float_t apdNoise = 0.012*2.5;
-    simEmc->SetAPDNoise(apdNoise);
-
-    //Raw Light Yield at +20C
-    simEmc->SetMeanLightYield(18800);
-
-    //ADC channel width at +18C.
-    simEmc->SetADCchannelW(0.0125);
   }
 
   if (iPMD)

diff --git a/test/generators/therminator/aod.C b/test/generators/therminator/aod.C
deleted file mode 100644 (file)
index a87c0b3..0000000
--- a/test/generators/therminator/aod.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void aod(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CreateAODfromESD.C");
-}

diff --git a/test/generators/therminator/check.C b/test/generators/therminator/check.C
deleted file mode 100644 (file)
index 5f336be..0000000
--- a/test/generators/therminator/check.C
+++ /dev/null
@@ -1,16 +0,0 @@
-void check(){
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibs.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
-
-  gSystem->Load("liblhapdf");      // Parton density functions
-  gSystem->Load("libEGPythia6");   // TGenerator interface
-  gSystem->Load("libpythia6");     // Pythia
-  gSystem->Load("libAliPythia6");  // ALICE specific implementations
-  gSystem->Load("libdpmjet");
-  gSystem->Load("libTDPMjet");
-  gROOT->Macro("$ALICE_ROOT/STEER/CheckESD.C");
-}

diff --git a/test/generators/therminator/monrec.C b/test/generators/therminator/monrec.C
deleted file mode 100644 (file)
index c6f1330..0000000
--- a/test/generators/therminator/monrec.C
+++ /dev/null
@@ -1,28 +0,0 @@
-void monrec() {
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Reconstruction pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-
-  gROOT->LoadMacro("rec.C");
-  rec();
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the AliESDs.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./AliESDs.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("AliESDs.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/therminator/monsim.C b/test/generators/therminator/monsim.C
deleted file mode 100644 (file)
index fcc88ff..0000000
--- a/test/generators/therminator/monsim.C
+++ /dev/null
@@ -1,27 +0,0 @@
-void monsim(Int_t nev=20){ 
-  // MonaLisa monitoring
-  gSystem->Load("libNet.so");
-  gSystem->Load("libMonaLisa.so");
-
-  new TMonaLisaWriter("aliendb3.cern.ch", "Simulation pp", gSystem->Getenv("TEST_PLATFORMID"), gSystem->Getenv("TEST_PLATFORMID"), "global");
-
-  gROOT->LoadMacro("sim.C");
-  sim(nev);
-  if (gMonitoringWriter) gMonitoringWriter->SendProcessingProgress(1,1,kTRUE);  
-
-  // Send the size of the raw.root file
-
-  FileStat_t buf;
-  gSystem->GetPathInfo("./raw.root",buf);
-
-  TList *valuelist = new TList();
-  valuelist->SetOwner(kTRUE);
-
-  TMonaLisaValue* valdouble = new TMonaLisaValue("raw.root size",buf.fSize);
-  valuelist->Add(valdouble);
-
-  if (gMonitoringWriter) gMonitoringWriter->SendParameters(valuelist);
-  delete valuelist;
-
-  printf("#Test finished successfully#\n");
-}

diff --git a/test/generators/therminator/rec.C b/test/generators/therminator/rec.C
index ebed8d3..e576eac 100644 (file)
--- a/test/generators/therminator/rec.C
+++ b/test/generators/therminator/rec.C
@@ -1,10 +1,4 @@
 void rec() {
-  if (!strcmp(gSystem->GetBuildArch(),"win32gcc")) {
-    gSystem->Load("libProof");
-    gSystem->Load("libGui");
-    gROOT->Macro("loadlibsrec.C");
-    new AliRun("gAlice","The ALICE Off-line Simulation Framework");
-  }
   AliReconstruction reco;
 
   reco.SetWriteESDfriend();
@@ -14,11 +8,6 @@ void rec() {
   reco.SetSpecificStorage("GRP/GRP/Data",
                          Form("local://%s",gSystem->pwd()));
 
-  AliGRPRecoParam *grpRecoParam = AliGRPRecoParam::GetLowFluxParam();
-  grpRecoParam->SetVertexerTracksConstraintITS(kFALSE);
-  grpRecoParam->SetVertexerTracksConstraintTPC(kFALSE);
-  reco.SetRecoParam("GRP",grpRecoParam);
-
   TStopwatch timer;
   timer.Start();
   reco.Run();

diff --git a/test/generators/therminator/runtest.sh b/test/generators/therminator/runtest.sh
index 4b69e14..856dcc5 100755 (executable)
--- a/test/generators/therminator/runtest.sh
+++ b/test/generators/therminator/runtest.sh
@@ -21,10 +21,6 @@ mv syswatch.log recwatch.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CheckESD.C 2>&1 | tee check.log
 aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
-cd recraw
-ln -s ../raw.root
-aliroot -b -q rec.C      2>&1 | tee rec.log
-aliroot -b -q ${ALICE_ROOT}/STEER/CreateAODfromESD.C 2>&1 | tee aod.log
 
 
 

diff --git a/test/generators/therminator/testvert.C b/test/generators/therminator/testvert.C
deleted file mode 100644 (file)
index dab13a7..0000000
--- a/test/generators/therminator/testvert.C
+++ /dev/null
@@ -1,25 +0,0 @@
-void testvert() {
-
-  TFile f("AliESDs.root");
-
-  TTree * tree = (TTree*)f.Get("esdTree");
-
-  AliESDEvent * esd = new AliESDEvent();// The signal ESD object is put here
-  esd->ReadFromTree(tree);
-
-  Int_t nev = tree->GetEntriesFast();
-  
-  for (Int_t iev=0; iev<nev; iev++) {
-    cout << "---------- Signal event ----------" << iev << endl;
-
-    // Get ESD
-    tree->GetEntry(iev);
-
-    AliESDVertex * vert = esd->GetPrimaryVertex();
-
-    if (vert) cout << vert->GetTitle() << endl;
-
-    if (strstr(vert->GetTitle(),"VertexerTracks")) cout << "OK" << endl;
-
-  }
-}