From 5889a25e8fe535aeac0bb8a9789b4ad7c403f89a Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 27 Feb 2015 16:05:14 +0100 Subject: [PATCH] Replace the PHOS version from IHEP to Run1 and fix the compilation, when possibletest/PbPbbench/Config.C --- test/QA/Config.C | 87 ++++++++++++--------- test/embedding/Config.C | 92 +++++++++++----------- test/generators/TUHKMgen/Config.C | 74 ++++++++++-------- test/generators/epos/Config.C | 111 +++++++++++++-------------- test/generators/herwig/Config.C | 83 ++++++++++---------- test/generators/therminator/Config.C | 82 ++++++++++---------- test/genkine/sim/Config.C | 2 +- test/gun/Config.C | 2 +- test/merge/backgr/Config.C | 2 +- test/merge/signal/Config.C | 2 +- test/ppbench/Config.C | 2 +- test/rawmerge/Config.C | 2 +- test/testdEdx/Config.C | 2 +- 13 files changed, 282 insertions(+), 261 deletions(-) diff --git a/test/QA/Config.C b/test/QA/Config.C index 0b6b84af73c..97ca7d64e9d 100644 --- a/test/QA/Config.C +++ b/test/QA/Config.C @@ -24,9 +24,13 @@ // One can use the configuration macro in compiled mode by // root [0] gSystem->Load("libgeant321"); -// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ -// -I$ALICE_ROOT -I$ALICE/geant3/TGeant3"); -// root [0] .x grun.C(1,"Config_PDC07.C++") +// root [1] gSystem->Load("libpythia6.4.25.so"); +// root [2] gSystem->Load("libqpythia.so"); +// root [3] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ +// -I$ALICE/geant3/TGeant3"); +// root [4] AliSimulation sim +// root [5] sim.SetConfigFile("Config.C++") +// root [6] sim.Run() #if !defined(__CINT__) || defined(__MAKECINT__) #include @@ -35,38 +39,41 @@ #include #include #include -#include "EVGEN/AliGenCocktail.h" -#include "EVGEN/AliGenParam.h" -#include "EVGEN/AliGenMUONlib.h" -#include "STEER/AliRunLoader.h" -#include "STEER/AliRun.h" -#include "STEER/AliConfig.h" -#include "PYTHIA6/AliDecayerPythia.h" -#include "PYTHIA6/AliGenPythia.h" -#include "STEER/AliMagF.h" -#include "STRUCT/AliBODY.h" -#include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv3.h" -#include "STRUCT/AliDIPOv3.h" -#include "STRUCT/AliHALLv3.h" -#include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv3.h" -#include "STRUCT/AliPIPEv3.h" -#include "ITS/AliITSgeom.h" -#include "ITS/AliITSvPPRasymmFMD.h" -#include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv3.h" -#include "ZDC/AliZDCv4.h" -#include "TRD/AliTRDv1.h" -#include "FMD/AliFMDv1.h" -#include "MUON/AliMUONv1.h" -#include "PHOS/AliPHOSv1.h" -#include "PMD/AliPMDv1.h" -#include "T0/AliT0v1.h" -#include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv1.h" -#include "VZERO/AliVZEROv7.h" +#include +#include "AliGenCocktail.h" +#include "AliGenParam.h" +#include "AliGenMUONlib.h" +#include "AliRunLoader.h" +#include "AliRun.h" +#include "AliConfig.h" +#include "AliDecayerPythia.h" +#include "AliGenPythia.h" +#include "AliMagF.h" +#include "AliBODY.h" +#include "AliMAG.h" +#include "AliABSOv3.h" +#include "AliDIPOv3.h" +#include "AliHALLv3.h" +#include "AliFRAMEv2.h" +#include "AliSHILv3.h" +#include "AliPIPEv3.h" +#include "AliITSgeom.h" +#include "AliITSv11.h" +#include "AliTPCv2.h" +#include "AliTOFv6T0.h" +#include "AliHMPIDv3.h" +#include "AliZDCv4.h" +#include "AliTRDv1.h" +#include "AliFMDv1.h" +#include "AliMUONv1.h" +#include "AliPHOSv1.h" +#include "AliPMDv1.h" +#include "AliT0v1.h" +#include "AliEMCALv2.h" +#include "AliACORDEv1.h" +#include "AliVZEROv7.h" +#include "AliSimulation.h" +#include "AliGenerator.h" #endif @@ -104,6 +111,11 @@ enum TrigConf_t { kDefaultPPTrig, kDefaultPbPbTrig }; +//--- U cut --- +enum YCut_t +{ + kFull, kBarrel, kMuonArm +}; const char * TrigConfName[] = { "p-p","Pb-Pb" @@ -118,7 +130,7 @@ enum PprGeo_t }; static PprGeo_t geo = kHoles; -class AliGenPythia ; + //--- Functions --- AliGenPythia *PythiaHard(PDC07Proc_t ); AliGenPythia *PythiaHVQ(PDC07Proc_t ); @@ -130,6 +142,7 @@ void ProcessEnvironmentVars(); static DecayHvFl_t decHvFl = kNature; static AliMagF::BMap_t mag = AliMagF::k5kG; static TrigConf_t trig = kDefaultPPTrig; // default pp trigger configuration +static YCut_t ycut = kFull; // default pp trigger configuration static Int_t runNumber= 0; static Int_t eventNumber= 0; //========================// @@ -550,7 +563,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/embedding/Config.C b/test/embedding/Config.C index 530c7441ce2..6cf487994e1 100644 --- a/test/embedding/Config.C +++ b/test/embedding/Config.C @@ -1,12 +1,12 @@ -// -// Configuration for the first physics production 2008 -// - // One can use the configuration macro in compiled mode by // root [0] gSystem->Load("libgeant321"); -// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ -// -I$ALICE_ROOT -I$ALICE/geant3/TGeant3"); -// root [0] .x grun.C(1,"Config.C++") +// root [1] gSystem->Load("libpythia6.4.25.so"); +// root [2] gSystem->Load("libqpythia.so"); +// root [3] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ +// -I$ALICE/geant3/TGeant3"); +// root [4] AliSimulation sim +// root [5] sim.SetConfigFile("Config.C++") +// root [6] sim.Run() #if !defined(__CINT__) || defined(__MAKECINT__) #include @@ -15,38 +15,41 @@ #include #include #include -#include "STEER/AliRunLoader.h" -#include "STEER/AliRun.h" -#include "STEER/AliConfig.h" -#include "PYTHIA6/AliDecayerPythia.h" -#include "PYTHIA6/AliGenPythia.h" -#include "TDPMjet/AliGenDPMjet.h" -#include "STEER/AliMagF.h" -#include "STRUCT/AliBODY.h" -#include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv3.h" -#include "STRUCT/AliDIPOv3.h" -#include "STRUCT/AliHALLv3.h" -#include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv3.h" -#include "STRUCT/AliPIPEv3.h" -#include "ITS/AliITSv11.h" -#include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv3.h" -#include "ZDC/AliZDCv4.h" -#include "TRD/AliTRDv1.h" -#include "TRD/AliTRDgeometry.h" -#include "FMD/AliFMDv1.h" -#include "MUON/AliMUONv1.h" -#include "PHOS/AliPHOSv1.h" - -#include "PHOS/AliPHOSv1.h" -#include "PMD/AliPMDv1.h" -#include "T0/AliT0v1.h" -#include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv1.h" -#include "VZERO/AliVZEROv7.h" +#include +#include "AliRunLoader.h" +#include "AliRun.h" +#include "AliConfig.h" +#include "AliDecayerPythia.h" +#include "AliGenPythia.h" +#include "AliGenDPMjet.h" +#include "AliMagF.h" +#include "AliBODY.h" +#include "AliMAG.h" +#include "AliABSOv3.h" +#include "AliDIPOv3.h" +#include "AliHALLv3.h" +#include "AliFRAMEv2.h" +#include "AliSHILv3.h" +#include "AliPIPEv3.h" +#include "AliITSv11.h" +#include "AliTPCv2.h" +#include "AliTOFv6T0.h" +#include "AliHMPIDv3.h" +#include "AliZDCv4.h" +#include "AliTRDv1.h" +#include "AliTRDgeometry.h" +#include "AliFMDv1.h" +#include "AliMUONv1.h" +#include "AliPHOSv1.h" +#include "AliPMDv1.h" +#include "AliT0v1.h" +#include "AliEMCALv2.h" +#include "AliACORDEv1.h" +#include "AliVZEROv7.h" +#include "AliSimulation.h" +#include "AliGenCocktail.h" +#include "AliGenTherminator.h" +#include "AliGenerator.h" #endif @@ -153,13 +156,6 @@ void Config() AliSimulation::Instance()->SetTriggerConfig("p-p"); } - // - // Set External decayer - TVirtualMCDecayer *decayer = new AliDecayerPythia(); - - decayer->SetForceDecay(kAll); - decayer->Init(); - gMC->SetExternalDecayer(decayer); //======================================================================= // ************* STEERING parameters FOR ALICE SIMULATION ************** // --- Specify event type to be tracked through the ALICE setup @@ -204,11 +200,11 @@ void Config() decayer->Init(); gMC->SetExternalDecayer(decayer); + AliGenerator* gener = 0x0; if ((embedrun == kMerged) || (embedrun == kSignal)) { //=========================// // Generator Configuration // //=========================// - AliGenerator* gener = 0x0; if (proc == kPythia6) { gener = MbPythia(); @@ -437,7 +433,7 @@ void Config() if (iPHOS) { //=================== PHOS parameters =========================== - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/generators/TUHKMgen/Config.C b/test/generators/TUHKMgen/Config.C index 6e94ebe6fc9..4d089a33f87 100644 --- a/test/generators/TUHKMgen/Config.C +++ b/test/generators/TUHKMgen/Config.C @@ -1,8 +1,12 @@ // One can use the configuration macro in compiled mode by // root [0] gSystem->Load("libgeant321"); -// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ -// -I$ALICE_ROOT -I$ALICE/geant3/TGeant3"); -// root [0] .x grun.C(1,"Config.C++") +// root [1] gSystem->Load("libpythia6.4.25.so"); +// root [2] gSystem->Load("libqpythia.so"); +// root [3] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ +// -I$ALICE/geant3/TGeant3"); +// root [4] AliSimulation sim +// root [5] sim.SetConfigFile("Config.C++") +// root [6] sim.Run() #if !defined(__CINT__) || defined(__MAKECINT__) #include @@ -11,35 +15,39 @@ #include #include #include -#include "STEER/AliRunLoader.h" -#include "STEER/AliRun.h" -#include "STEER/AliConfig.h" -#include "PYTHIA6/AliDecayerPythia.h" -#include "EVGEN/AliGenCocktail.h" -#include "EVGEN/AliGenHIJINGpara.h" -#include "STEER/AliMagF.h" -#include "STRUCT/AliBODY.h" -#include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv3.h" -#include "STRUCT/AliDIPOv3.h" -#include "STRUCT/AliHALLv3.h" -#include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv3.h" -#include "STRUCT/AliPIPEv3.h" -#include "ITS/AliITSv11.h" -#include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv3.h" -#include "ZDC/AliZDCv4.h" -#include "TRD/AliTRDv1.h" -#include "FMD/AliFMDv1.h" -#include "MUON/AliMUONv1.h" -#include "PHOS/AliPHOSv1.h" -#include "PMD/AliPMDv1.h" -#include "T0/AliT0v1.h" -#include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv1.h" -#include "VZERO/AliVZEROv7.h" +#include +#include "AliRunLoader.h" +#include "AliRun.h" +#include "AliConfig.h" +#include "AliDecayerPythia.h" +#include "AliGenCocktail.h" +#include "AliGenHIJINGpara.h" +#include "AliMagF.h" +#include "AliBODY.h" +#include "AliMAG.h" +#include "AliABSOv3.h" +#include "AliDIPOv3.h" +#include "AliHALLv3.h" +#include "AliFRAMEv2.h" +#include "AliSHILv3.h" +#include "AliPIPEv3.h" +#include "AliITSv11.h" +#include "AliTPCv2.h" +#include "AliTOFv6T0.h" +#include "AliHMPIDv3.h" +#include "AliZDCv4.h" +#include "AliTRDv1.h" +#include "AliTRDgeometry.h" +#include "AliFMDv1.h" +#include "AliMUONv1.h" +#include "AliPHOSv1.h" +#include "AliPMDv1.h" +#include "AliT0v1.h" +#include "AliEMCALv2.h" +#include "AliACORDEv1.h" +#include "AliVZEROv7.h" +#include "AliGenUHKM.h" +#include "AliSimulation.h" #endif enum PprTrigConf_t @@ -350,7 +358,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/generators/epos/Config.C b/test/generators/epos/Config.C index e89b3492ee4..ee5433e2fe5 100644 --- a/test/generators/epos/Config.C +++ b/test/generators/epos/Config.C @@ -1,8 +1,12 @@ // One can use the configuration macro in compiled mode by // root [0] gSystem->Load("libgeant321"); -// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ -// -I$ALICE_ROOT -I$ALICE/geant3/TGeant3"); -// root [0] .x grun.C(1,"ConfigPPR.C++") +// root [1] gSystem->Load("libpythia6.4.25.so"); +// root [2] gSystem->Load("libqpythia.so"); +// root [3] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ +// -I$ALICE/geant3/TGeant3"); +// root [4] AliSimulation sim +// root [5] sim.SetConfigFile("Config.C++") +// root [6] sim.Run() #if !defined(__CINT__) || defined(__MAKECINT__) #include @@ -12,49 +16,52 @@ #include #include #include -#include "STEER/AliRunLoader.h" -#include "STEER/AliRun.h" -#include "STEER/AliConfig.h" -#include "STEER/AliGenerator.h" -#include "STEER/AliLog.h" -#include "PYTHIA6/AliDecayerPythia.h" -#include "EVGEN/AliGenHIJINGpara.h" -#include "THijing/AliGenHijing.h" -#include "EVGEN/AliGenCocktail.h" -#include "EVGEN/AliGenSlowNucleons.h" -#include "EVGEN/AliSlowNucleonModelExp.h" -#include "EVGEN/AliGenParam.h" -#include "EVGEN/AliGenMUONlib.h" -#include "EVGEN/AliGenSTRANGElib.h" -#include "EVGEN/AliGenMUONCocktail.h" -#include "EVGEN/AliGenCocktail.h" -#include "EVGEN/AliGenGeVSim.h" -#include "EVGEN/AliGeVSimParticle.h" -#include "PYTHIA6/AliGenPythia.h" -#include "STEER/AliMagF.h" -#include "STRUCT/AliBODY.h" -#include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv3.h" -#include "STRUCT/AliDIPOv3.h" -#include "STRUCT/AliHALLv3.h" -#include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv3.h" -#include "STRUCT/AliPIPEv3.h" -#include "ITS/AliITSv11.h" -#include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv3.h" -#include "ZDC/AliZDCv4.h" -#include "TRD/AliTRDv1.h" -#include "FMD/AliFMDv1.h" -#include "MUON/AliMUONv1.h" -#include "PHOS/AliPHOSv1.h" -#include "PMD/AliPMDv1.h" -#include "T0/AliT0v1.h" -#include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv1.h" -#include "VZERO/AliVZEROv7.h" -#include "EPOS/AliGenEpos.h" +#include +#include "AliRunLoader.h" +#include "AliRun.h" +#include "AliConfig.h" +#include "AliGenerator.h" +#include "AliLog.h" +#include "AliDecayerPythia.h" +#include "AliGenHIJINGpara.h" +#include "AliGenHijing.h" +#include "AliGenCocktail.h" +#include "AliGenSlowNucleons.h" +#include "AliSlowNucleonModelExp.h" +#include "AliGenParam.h" +#include "AliGenMUONlib.h" +#include "AliGenSTRANGElib.h" +#include "AliGenMUONCocktail.h" +#include "AliGenCocktail.h" +#include "AliGenGeVSim.h" +#include "AliGeVSimParticle.h" +#include "AliGenPythia.h" +#include "AliMagF.h" +#include "AliBODY.h" +#include "AliMAG.h" +#include "AliABSOv3.h" +#include "AliDIPOv3.h" +#include "AliHALLv3.h" +#include "AliFRAMEv2.h" +#include "AliSHILv3.h" +#include "AliPIPEv3.h" +#include "AliITSv11.h" +#include "AliTPCv2.h" +#include "AliTOFv6T0.h" +#include "AliHMPIDv3.h" +#include "AliZDCv4.h" +#include "AliTRDv1.h" +#include "AliFMDv1.h" +#include "AliMUONv1.h" +#include "AliPHOSv1.h" +#include "AliPMDv1.h" +#include "AliT0v1.h" +#include "AliEMCALv2.h" +#include "AliACORDEv1.h" +#include "AliVZEROv7.h" +#include "AliGenEpos.h" +#include "AliTRDgeometry.h" +#include "AliSimulation.h" #endif enum PprTrigConf_t @@ -356,7 +363,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } @@ -402,16 +409,6 @@ Float_t EtaToTheta(Float_t arg){ void ProcessEnvironmentVars() { - // Run type - if (gSystem->Getenv("CONFIG_RUN_TYPE")) { - for (Int_t iRun = 0; iRun < kRunMax; iRun++) { - if (strcmp(gSystem->Getenv("CONFIG_RUN_TYPE"), pprRunName[iRun])==0) { - srun = (PprRun_t)iRun; - cout<<"Run type set to "<Getenv("CONFIG_SEED")) { sseed = atoi(gSystem->Getenv("CONFIG_SEED")); diff --git a/test/generators/herwig/Config.C b/test/generators/herwig/Config.C index b0605e37015..b9187cda467 100644 --- a/test/generators/herwig/Config.C +++ b/test/generators/herwig/Config.C @@ -1,12 +1,12 @@ -// -// Configuration for the first physics production 2008 -// - // One can use the configuration macro in compiled mode by // root [0] gSystem->Load("libgeant321"); -// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ -// -I$ALICE_ROOT -I$ALICE/geant3/TGeant3"); -// root [0] .x grun.C(1,"Config.C++") +// root [1] gSystem->Load("libpythia6.4.25.so"); +// root [2] gSystem->Load("libqpythia.so"); +// root [3] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ +// -I$ALICE/geant3/TGeant3"); +// root [4] AliSimulation sim +// root [5] sim.SetConfigFile("Config.C++") +// root [6] sim.Run() #if !defined(__CINT__) || defined(__MAKECINT__) #include @@ -15,38 +15,40 @@ #include #include #include -#include "STEER/AliRunLoader.h" -#include "STEER/AliRun.h" -#include "STEER/AliConfig.h" -#include "PYTHIA6/AliDecayerPythia.h" -#include "PYTHIA6/AliGenPythia.h" -#include "TDPMjet/AliGenDPMjet.h" -#include "THerwig/AliGenHerwig.h" -#include "STEER/AliMagFCheb.h" -#include "STRUCT/AliBODY.h" -#include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv3.h" -#include "STRUCT/AliDIPOv3.h" -#include "STRUCT/AliHALLv3.h" -#include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv3.h" -#include "STRUCT/AliPIPEv3.h" -#include "ITS/AliITSv11.h" -#include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv3.h" -#include "ZDC/AliZDCv4.h" -#include "TRD/AliTRDv1.h" -#include "TRD/AliTRDgeometry.h" -#include "FMD/AliFMDv1.h" -#include "MUON/AliMUONv1.h" -#include "PHOS/AliPHOSv1.h" -#include "PHOS/AliPHOSSimParam.h" -#include "PMD/AliPMDv1.h" -#include "T0/AliT0v1.h" -#include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv1.h" -#include "VZERO/AliVZEROv7.h" +#include +#include "AliRunLoader.h" +#include "AliRun.h" +#include "AliConfig.h" +#include "AliDecayerPythia.h" +#include "AliGenPythia.h" +#include "AliGenDPMjet.h" +#include "AliGenHerwig.h" +#include "AliMagF.h" +#include "AliBODY.h" +#include "AliMAG.h" +#include "AliABSOv3.h" +#include "AliDIPOv3.h" +#include "AliHALLv3.h" +#include "AliFRAMEv2.h" +#include "AliSHILv3.h" +#include "AliPIPEv3.h" +#include "AliITSv11.h" +#include "AliTPCv2.h" +#include "AliTOFv6T0.h" +#include "AliHMPIDv3.h" +#include "AliZDCv4.h" +#include "AliTRDv1.h" +#include "AliTRDgeometry.h" +#include "AliFMDv1.h" +#include "AliMUONv1.h" +#include "AliPHOSv1.h" +#include "AliPHOSSimParam.h" +#include "AliPMDv1.h" +#include "AliT0v1.h" +#include "AliEMCALv2.h" +#include "AliACORDEv1.h" +#include "AliVZEROv7.h" +#include "AliSimulation.h" #endif enum PDC06Proc_t @@ -196,6 +198,7 @@ void Config() gener = MbPhojet(); break; case kHerwig: + default: gener = Herwig(); break; } @@ -393,7 +396,7 @@ void Config() { //=================== PHOS parameters =========================== - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } if (iPMD) diff --git a/test/generators/therminator/Config.C b/test/generators/therminator/Config.C index 577c6af1bf1..e10dc33589c 100644 --- a/test/generators/therminator/Config.C +++ b/test/generators/therminator/Config.C @@ -1,12 +1,12 @@ -// -// Configuration for the first physics production 2008 -// - // One can use the configuration macro in compiled mode by // root [0] gSystem->Load("libgeant321"); -// root [0] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ -// -I$ALICE_ROOT -I$ALICE/geant3/TGeant3"); -// root [0] .x grun.C(1,"Config.C++") +// root [1] gSystem->Load("libpythia6.4.25.so"); +// root [2] gSystem->Load("libqpythia.so"); +// root [3] gSystem->SetIncludePath("-I$ROOTSYS/include -I$ALICE_ROOT/include\ +// -I$ALICE/geant3/TGeant3"); +// root [4] AliSimulation sim +// root [5] sim.SetConfigFile("Config.C++") +// root [6] sim.Run() #if !defined(__CINT__) || defined(__MAKECINT__) #include @@ -15,37 +15,40 @@ #include #include #include -#include "STEER/AliRunLoader.h" -#include "STEER/AliRun.h" -#include "STEER/AliConfig.h" -#include "PYTHIA6/AliDecayerPythia.h" -#include "PYTHIA6/AliGenPythia.h" -#include "TDPMjet/AliGenDPMjet.h" -#include "STEER/AliMagFCheb.h" -#include "STRUCT/AliBODY.h" -#include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv3.h" -#include "STRUCT/AliDIPOv3.h" -#include "STRUCT/AliHALLv3.h" -#include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv3.h" -#include "STRUCT/AliPIPEv3.h" -#include "ITS/AliITSv11.h" -#include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv3.h" -#include "ZDC/AliZDCv4.h" -#include "TRD/AliTRDv1.h" -#include "TRD/AliTRDgeometry.h" -#include "FMD/AliFMDv1.h" -#include "MUON/AliMUONv1.h" -#include "PHOS/AliPHOSv1.h" -#include "PHOS/AliPHOSSimParam.h" -#include "PMD/AliPMDv1.h" -#include "T0/AliT0v1.h" -#include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv1.h" -#include "VZERO/AliVZEROv7.h" +#include +#include "AliRunLoader.h" +#include "AliRun.h" +#include "AliConfig.h" +#include "AliDecayerPythia.h" +#include "AliGenPythia.h" +#include "AliGenDPMjet.h" +#include "AliMagF.h" +#include "AliBODY.h" +#include "AliMAG.h" +#include "AliABSOv3.h" +#include "AliDIPOv3.h" +#include "AliHALLv3.h" +#include "AliFRAMEv2.h" +#include "AliSHILv3.h" +#include "AliPIPEv3.h" +#include "AliITSv11.h" +#include "AliTPCv2.h" +#include "AliTOFv6T0.h" +#include "AliHMPIDv3.h" +#include "AliZDCv4.h" +#include "AliTRDv1.h" +#include "AliTRDgeometry.h" +#include "AliFMDv1.h" +#include "AliMUONv1.h" +#include "AliPHOSv1.h" +#include "AliPHOSSimParam.h" +#include "AliPMDv1.h" +#include "AliT0v1.h" +#include "AliEMCALv2.h" +#include "AliACORDEv1.h" +#include "AliVZEROv7.h" +#include "AliGenTherminator.h" +#include "AliSimulation.h" #endif enum PDC06Proc_t @@ -202,6 +205,7 @@ void Config() gener = MbPhojet(); break; case kTherminator: + default: gener = Therminator(); break; } @@ -399,7 +403,7 @@ void Config() { //=================== PHOS parameters =========================== - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } if (iPMD) diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C index 33fa34e2be5..95d8713b139 100644 --- a/test/genkine/sim/Config.C +++ b/test/genkine/sim/Config.C @@ -300,7 +300,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/gun/Config.C b/test/gun/Config.C index 4253a146901..e9826a2c63a 100644 --- a/test/gun/Config.C +++ b/test/gun/Config.C @@ -490,7 +490,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C index 02a377c1e3d..de18c79e2a0 100644 --- a/test/merge/backgr/Config.C +++ b/test/merge/backgr/Config.C @@ -347,7 +347,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C index 707b6fcdb66..7444ab29ba8 100644 --- a/test/merge/signal/Config.C +++ b/test/merge/signal/Config.C @@ -346,7 +346,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C index c4187df3bcb..254584ccad7 100644 --- a/test/ppbench/Config.C +++ b/test/ppbench/Config.C @@ -350,7 +350,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/rawmerge/Config.C b/test/rawmerge/Config.C index 4d5e17fc173..076ebccb3d8 100644 --- a/test/rawmerge/Config.C +++ b/test/rawmerge/Config.C @@ -438,7 +438,7 @@ void Config() if (iPHOS) { //=================== PHOS parameters =========================== - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } diff --git a/test/testdEdx/Config.C b/test/testdEdx/Config.C index fcd8b6a8d46..0ebbfeb9d10 100644 --- a/test/testdEdx/Config.C +++ b/test/testdEdx/Config.C @@ -350,7 +350,7 @@ void Config() if (iPHOS) { - AliPHOS *PHOS = new AliPHOSv1("PHOS", "IHEP"); + AliPHOS *PHOS = new AliPHOSv1("PHOS", "Run1"); } -- 2.39.3