X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfigHBT.C;h=dabc206b3da51be9aed2680f2a3b68226208ff76;hb=000bb28fae0199344f7dbc879333ebed921b5c77;hp=44df9e2af4ebbb4a4962e03345ed3dd323679b42;hpb=ababa197709bb902695a4f6f5e8474dfd0bf11b3;p=u%2Fmrichter%2FAliRoot.git diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C index 44df9e2af4e..dabc206b3da 100644 --- a/macros/ConfigHBT.C +++ b/macros/ConfigHBT.C @@ -6,6 +6,7 @@ #if !defined(__CINT__) || defined(__MAKECINT__) #include +#include #include #include #include @@ -21,17 +22,17 @@ #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/AliITSvPPRasymmFMD.h" +#include "STRUCT/AliSHILv3.h" +#include "STRUCT/AliPIPEv3.h" +#include "ITS/AliITSv11Hybrid.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv5T0.h" -#include "HMPID/AliHMPIDv1.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" @@ -39,7 +40,7 @@ #include "PMD/AliPMDv1.h" #include "T0/AliT0v1.h" #include "EMCAL/AliEMCALv2.h" -#include "CRT/AliCRTv1.h" +#include "ACORDE/AliACORDEv1.h" #endif void Config() @@ -54,6 +55,11 @@ void Config() 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 - gAlice->SetTriggerDescriptor("Pb-Pb"); + 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 ********************************/ @@ -226,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; @@ -262,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"); } @@ -285,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"); } @@ -300,65 +308,15 @@ 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(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 AliITSv11Hybrid("ITS","ITS v11Hybrid"); + } if (iTPC) @@ -370,13 +328,13 @@ void Config() if (iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF"); + AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF"); } if (iHMPID) { //=================== HMPID parameters =========================== - AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID"); + AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID"); } @@ -385,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) @@ -438,7 +396,7 @@ void Config() if (iEMCAL && !iHMPID) { //=================== EMCAL parameters ============================ - AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG"); + AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE"); } if (iT0)