X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=test%2Fmerge%2Fbackgr%2FConfig.C;h=cc4c225f20f6b47ae03346ad7ad4b51dee81b347;hp=ad071f53d37edab3e6fae13a366725c551aa6e1f;hb=3fc6785c688778da57e9edc41a22772f2e2e5302;hpb=0d7ef405ae9ea9cd027c4794d2c96fac8229d8ce diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C index ad071f53d37..cc4c225f20f 100644 --- a/test/merge/backgr/Config.C +++ b/test/merge/backgr/Config.C @@ -35,17 +35,17 @@ #include "STEER/AliMagFMaps.h" #include "STRUCT/AliBODY.h" #include "STRUCT/AliMAG.h" -#include "STRUCT/AliABSOv0.h" -#include "STRUCT/AliDIPOv2.h" -#include "STRUCT/AliHALL.h" +#include "STRUCT/AliABSOv3.h" +#include "STRUCT/AliDIPOv3.h" +#include "STRUCT/AliHALLv3.h" #include "STRUCT/AliFRAMEv2.h" -#include "STRUCT/AliSHILv2.h" -#include "STRUCT/AliPIPEv0.h" -#include "ITS/AliITSvPPRasymmFMD.h" +#include "STRUCT/AliSHILv3.h" +#include "STRUCT/AliPIPEv3.h" +#include "ITS/AliITSv11Hybrid.h" #include "TPC/AliTPCv2.h" #include "TOF/AliTOFv6T0.h" -#include "HMPID/AliHMPIDv1.h" -#include "ZDC/AliZDCv2.h" +#include "HMPID/AliHMPIDv3.h" +#include "ZDC/AliZDCv3.h" #include "TRD/AliTRDv1.h" #include "FMD/AliFMDv1.h" #include "MUON/AliMUONv1.h" @@ -120,6 +120,11 @@ const char * pprTrigConfName[] = { "p-p","Pb-Pb" }; +enum PprGeo_t + { + kHoles, kNoHoles + }; + // This part for configuration //static PprRun_t srun = test50; static PprRun_t srun = kHijing_per4; @@ -129,6 +134,7 @@ TDatime dat; static Int_t sseed = dat.Get(); //Set 0 to use the current time //static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration static PprTrigConf_t strig = kDefaultPbPbTrig; // default PbPb trigger configuration +static PprGeo_t geo = kHoles; // Comment line static TString comment; @@ -153,8 +159,12 @@ void Config() cout<<"Seed for random number generation= "<GetSeed()<Load("liblhapdf.so"); // Parton density functions + gSystem->Load("libEGPythia6.so"); // TGenerator interface + gSystem->Load("libpythia6.so"); // Pythia + gSystem->Load("libAliPythia6.so"); // ALICE specific implementations gSystem->Load("libgeant321"); #endif @@ -317,21 +327,21 @@ void Config() if (iABSO) { //=================== ABSO parameters ============================ - AliABSO *ABSO = new AliABSOv0("ABSO", "Muon Absorber"); + AliABSO *ABSO = new AliABSOv3("ABSO", "Muon Absorber"); } if (iDIPO) { //=================== DIPO parameters ============================ - AliDIPO *DIPO = new AliDIPOv2("DIPO", "Dipole version 2"); + AliDIPO *DIPO = new AliDIPOv3("DIPO", "Dipole version 3"); } if (iHALL) { //=================== HALL parameters ============================ - AliHALL *HALL = new AliHALL("HALL", "Alice Hall"); + AliHALL *HALL = new AliHALLv3("HALL", "Alice Hall"); } @@ -340,13 +350,18 @@ void Config() //=================== FRAME parameters ============================ AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); + if (geo == kHoles) { + FRAME->SetHoles(1); + } else { + FRAME->SetHoles(0); + } } if (iSHIL) { //=================== SHIL parameters ============================ - AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2"); + AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3"); } @@ -354,63 +369,14 @@ void Config() { //=================== PIPE parameters ============================ - AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe"); + AliPIPE *PIPE = new AliPIPEv3("PIPE", "Beam Pipe"); } - if(iITS) { + if (iITS) + { + //=================== ITS parameters ============================ - //=================== ITS parameters ============================ - // - // As the innermost detector in ALICE, the Inner Tracking System "impacts" on - // almost all other detectors. This involves the fact that the ITS geometry - // still has several options to be followed in parallel in order to determine - // the best set-up which minimizes the induced background. All the geometries - // available to date are described in the following. Read carefully the comments - // and use the default version (the only one uncommented) unless you are making - // comparisons and you know what you are doing. In this case just uncomment the - // ITS geometry you want to use and run Aliroot. - // - // Detailed geometries: - // - // - //AliITS *ITS = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services"); - // - //AliITS *ITS = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services"); - // - AliITSvPPRasymmFMD *ITS = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services"); - ITS->SetMinorVersion(2); // don't touch this parameter if you're not an ITS developer - ITS->SetReadDet(kFALSE); // don't touch this parameter if you're not an ITS developer - // ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det"); // don't touch this parameter if you're not an ITS developer - ITS->SetThicknessDet1(200.); // detector thickness on layer 1 must be in the range [100,300] - ITS->SetThicknessDet2(200.); // detector thickness on layer 2 must be in the range [100,300] - ITS->SetThicknessChip1(150.); // chip thickness on layer 1 must be in the range [150,300] - ITS->SetThicknessChip2(150.); // chip thickness on layer 2 must be in the range [150,300] - ITS->SetRails(0); // 1 --> rails in ; 0 --> rails out - ITS->SetCoolingFluid(1); // 1 --> water ; 0 --> freon - - // Coarse geometries (warning: no hits are produced with these coarse geometries and they unuseful - // for reconstruction !): - // - // - //AliITSvPPRcoarseasymm *ITS = new AliITSvPPRcoarseasymm("ITS","New ITS PPR coarse version with asymmetric services"); - //ITS->SetRails(0); // 1 --> rails in ; 0 --> rails out - //ITS->SetSupportMaterial(0); // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon - // - //AliITS *ITS = new AliITSvPPRcoarsesymm("ITS","New ITS PPR coarse version with symmetric services"); - //ITS->SetRails(0); // 1 --> rails in ; 0 --> rails out - //ITS->SetSupportMaterial(0); // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon - // - // - // - // Geant3 <-> EUCLID conversion - // ============================ - // - // SetEUCLID is a flag to output (=1) or not to output (=0) both geometry and - // media to two ASCII files (called by default ITSgeometry.euc and - // ITSgeometry.tme) in a format understandable to the CAD system EUCLID. - // The default (=0) means that you dont want to use this facility. - // - ITS->SetEUCLID(0); + AliITS *ITS = new AliITSv11Hybrid("ITS","ITS v11Hybrid"); } if (iTPC) @@ -429,7 +395,7 @@ void Config() if (iHMPID) { //=================== HMPID parameters =========================== - AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID"); + AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID"); } @@ -438,7 +404,7 @@ void Config() { //=================== ZDC parameters ============================ - AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC"); + AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC"); } if (iTRD)