X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=macros%2FConfigHBT.C;h=f026337b8a8fef07a7719746204210a527062d4f;hp=0bc2d8e2302553844630684d947d983ad7d761ba;hb=330378456818217c875a96e575a0d12e978d15af;hpb=2f03a4edecaf40f38f4b0f8e14d14f3a69f243c6 diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C index 0bc2d8e2302..f026337b8a8 100644 --- a/macros/ConfigHBT.C +++ b/macros/ConfigHBT.C @@ -6,6 +6,7 @@ #if !defined(__CINT__) || defined(__MAKECINT__) #include +#include #include #include #include @@ -21,26 +22,25 @@ #include "THbtp/AliGenHBTprocessor.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/AliITSvPPRasymm.h" +#include "STRUCT/AliSHILv3.h" +#include "STRUCT/AliPIPEv3.h" +#include "ITS/AliITSv11.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2.h" -#include "RICH/AliRICHv1.h" -#include "ZDC/AliZDCv1.h" +#include "TOF/AliTOFv6T0.h" +#include "HMPID/AliHMPIDv3.h" +#include "ZDC/AliZDCv3.h" #include "TRD/AliTRDv1.h" #include "FMD/AliFMDv1.h" #include "MUON/AliMUONv1.h" #include "PHOS/AliPHOSv1.h" #include "PMD/AliPMDv1.h" -#include "START/AliSTARTv1.h" -#include "EMCAL/AliEMCALv1.h" -#include "CRT/AliCRTv1.h" -#include "VZERO/AliVZEROv2.h" +#include "T0/AliT0v1.h" +#include "EMCAL/AliEMCALv2.h" +#include "ACORDE/AliACORDEv1.h" #endif void Config() @@ -53,10 +53,15 @@ void Config() gSystem->Load("libgeant321"); #endif - new TGeant3("C++ Interface to Geant3"); + new TGeant3TGeo("C++ Interface to Geant3"); + + if(!AliCDBManager::Instance()->IsDefaultStorageSet()){ + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); + AliCDBManager::Instance()->SetRun(0); + } cout<<"Config.C: Creating Run Loader ..."<SetCompressionLevel(2); rl->SetNumberOfEventsPerFile(6); gAlice->SetRunLoader(rl); + // gAlice->SetGeometryFromFile("geometry.root"); + // gAlice->SetGeometryFromCDB(); + + // Set the trigger configuration + AliSimulation::Instance()->SetTriggerConfig("Pb-Pb"); + cout<<"Trigger configuration is set to Pb-Pb"<SetMomentumRange(0, 3); // g1->SetOrigin(0,0,0); //vertex position // g1->SetSigma(0,0,0); //Sigma in (X,Y,Z) (cm) on IP position - // g1->SetPart(310); //K0short(310), Lambda(3122) + // g1->SetPart(kK0Short); //K0short(310), Lambda(3122) /***************** M E V S I M ********************************/ @@ -223,7 +234,7 @@ void Config() //Last number indicates the scale factor Int_t iABSO = 1; - Int_t iCRT = 0; + Int_t iACORDE = 0; Int_t iDIPO = 1; Int_t iFMD = 0; Int_t iFRAME = 1; @@ -234,9 +245,9 @@ void Config() Int_t iPHOS = 0; Int_t iPIPE = 1; Int_t iPMD = 0; - Int_t iRICH = 0; + Int_t iHMPID = 0; Int_t iSHIL = 1; - Int_t iSTART = 0; + Int_t iT0 = 0; Int_t iTOF = 0; Int_t iTPC = 1; Int_t iTRD = 0; @@ -259,21 +270,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"); } @@ -282,14 +293,14 @@ void Config() //=================== FRAME parameters ============================ AliFRAME *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); - + FRAME->SetHoles(1); } if (iSHIL) { //=================== SHIL parameters ============================ - AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding"); + AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding"); } @@ -297,116 +308,33 @@ 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"); - // - AliITSvPPRasymm *ITS = new AliITSvPPRasymm("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(200.); // chip thickness on layer 1 must be in the range [150,300] - ITS->SetThicknessChip2(200.); // chip thickness on layer 2 must be in the range [150,300] - ITS->SetRails(1); // 1 --> rails in ; 0 --> rails out - ITS->SetCoolingFluid(1); // 1 --> water ; 0 --> freon - // - //AliITSvPPRsymm *ITS = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric 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_vPPRsymm2.det"); // don't touch this parameter if you're not an ITS developer - //ITS->SetThicknessDet1(300.); // detector thickness on layer 1 must be in the range [100,300] - //ITS->SetThicknessDet2(300.); // detector thickness on layer 2 must be in the range [100,300] - //ITS->SetThicknessChip1(300.); // chip thickness on layer 1 must be in the range [150,300] - //ITS->SetThicknessChip2(300.); // chip thickness on layer 2 must be in the range [150,300] - //ITS->SetRails(1); // 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(1); // 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(1); // 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 AliITSv11("ITS","ITS v11"); + } if (iTPC) { - //============================ TPC parameters ================================ - // --- This allows the user to specify sectors for the SLOW (TPC geometry 2) - // --- Simulator. SecAL (SecAU) <0 means that ALL lower (upper) - // --- sectors are specified, any value other than that requires at least one - // --- sector (lower or upper)to be specified! - // --- Reminder: sectors 1-24 are lower sectors (1-12 -> z>0, 13-24 -> z<0) - // --- sectors 25-72 are the upper ones (25-48 -> z>0, 49-72 -> z<0) - // --- SecLows - number of lower sectors specified (up to 6) - // --- SecUps - number of upper sectors specified (up to 12) - // --- Sens - sensitive strips for the Slow Simulator !!! - // --- This does NOT work if all S or L-sectors are specified, i.e. - // --- if SecAL or SecAU < 0 - // - // - //----------------------------------------------------------------------------- - - // gROOT->LoadMacro("SetTPCParam.C"); - // AliTPCParam *param = SetTPCParam(); + //============================ TPC parameters =================== AliTPC *TPC = new AliTPCv2("TPC", "Default"); - - // All sectors included - TPC->SetSecAL(-1); - TPC->SetSecAU(-1); - } if (iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2("TOF", "normal TOF"); + AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF"); } - if (iRICH) + if (iHMPID) { - //=================== RICH parameters =========================== - AliRICH *RICH = new AliRICHv1("RICH", "normal RICH"); + //=================== HMPID parameters =========================== + AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID"); } @@ -415,14 +343,14 @@ void Config() { //=================== ZDC parameters ============================ - AliZDC *ZDC = new AliZDCv1("ZDC", "normal ZDC"); + AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC"); } - if (iCRT) + if (iACORDE) { - //=================== CRT parameters ============================ + //=================== ACORDE parameters ============================ - AliCRT *CRT = new AliCRTv1("CRT", "normal CRT"); + AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE"); } if (iTRD) @@ -430,16 +358,6 @@ void Config() //=================== TRD parameters ============================ AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator"); - - // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2) - TRD->SetGasMix(1); - - // With hole in front of PHOS - TRD->SetPHOShole(); - // With hole in front of RICH - TRD->SetRICHhole(); - // Switch on TR - AliTRDsim *TRDsim = TRD->CreateTR(); } if (iFMD) @@ -475,16 +393,16 @@ void Config() PMD->SetPadSize(0.8, 1.0, 1.0, 1.5); } - if (iEMCAL && !iRICH) + if (iEMCAL && !iHMPID) { //=================== EMCAL parameters ============================ - AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCALArch1a"); + AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE"); } - if (iSTART) + if (iT0) { - //=================== START parameters ============================ - AliSTART *START = new AliSTARTv1("START", "START Detector"); + //=================== T0 parameters ============================ + AliT0 *T0 = new AliT0v1("T0", "T0 Detector"); }