X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfig_PDC06.C;h=12eeabeb4eb4c7cf01560116ec7eae7eaad773ad;hb=b92524d08ae5ace77f27ecb68db63247546a0ef7;hp=3717e0d946236b0790c82e4ed721010e01e8c344;hpb=9e8b3f5fda341977d43ed4365cb7640696c1c4dc;p=u%2Fmrichter%2FAliRoot.git diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C index 3717e0d9462..12eeabeb4eb 100644 --- a/macros/Config_PDC06.C +++ b/macros/Config_PDC06.C @@ -26,26 +26,26 @@ #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 "STRUCT/AliSHILv3.h" +#include "STRUCT/AliPIPEv3.h" #include "ITS/AliITSgeom.h" #include "ITS/AliITSvPPRasymmFMD.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv5T0.h" -#include "RICH/AliRICHv1.h" +#include "TOF/AliTOFv6T0.h" +#include "HMPID/AliHMPIDv2.h" #include "ZDC/AliZDCv2.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 "T0/AliT0v1.h" #include "EMCAL/AliEMCALv2.h" -#include "CRT/AliCRTv0.h" +#include "ACORDE/AliACORDEv0.h" #include "VZERO/AliVZEROv7.h" #endif @@ -103,7 +103,7 @@ AliGenerator *PyMbTriggered(Int_t pdg); void ProcessEnvironmentVars(); // This part for configuration -static PDC06Proc_t proc = kPyOmegaPlus; +static PDC06Proc_t proc = kPyMbNoHvq; static DecayHvFl_t decHvFl = kNature; static YCut_t ycut = kFull; static Mag_t mag = k5kG; @@ -162,6 +162,11 @@ void Config() new TGeant3TGeo("C++ Interface to Geant3"); + if(!AliCDBManager::Instance()->IsDefaultStorageSet()){ + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetRun(0); + } + //======================================================================= // Create the output file @@ -180,6 +185,8 @@ void Config() rl->SetCompressionLevel(2); rl->SetNumberOfEventsPerFile(1000); gAlice->SetRunLoader(rl); + // gAlice->SetGeometryFromFile("geometry.root"); + // gAlice->SetGeometryFromCDB(); // Set the trigger configuration gAlice->SetTriggerDescriptor(TrigConfName[trig]); @@ -346,7 +353,7 @@ void Config() Int_t iABSO = 1; - Int_t iCRT = 0; + Int_t iACORDE = 0; Int_t iDIPO = 1; Int_t iEMCAL = 1; Int_t iFMD = 1; @@ -358,9 +365,9 @@ void Config() Int_t iPHOS = 1; Int_t iPIPE = 1; Int_t iPMD = 1; - Int_t iRICH = 1; + Int_t iHMPID = 1; Int_t iSHIL = 1; - Int_t iSTART = 1; + Int_t iT0 = 1; Int_t iTOF = 1; Int_t iTPC = 1; Int_t iTRD = 1; @@ -384,21 +391,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"); } @@ -413,7 +420,7 @@ void Config() { //=================== SHIL parameters ============================ - AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2"); + AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3"); } @@ -421,63 +428,14 @@ void Config() { //=================== PIPE parameters ============================ - AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe"); + AliPIPE *PIPE = new AliPIPEv3("PIPE", "Beam Pipe"); } - if(iITS) { - - //=================== 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"); - // + if (iITS) + { + //=================== ITS parameters ============================ + 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); } if (iTPC) @@ -489,18 +447,21 @@ void Config() if (iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF"); + AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF"); // Partial geometry: modules at 2,3,4,6,7,11,12,14,15,16 // starting at 6h in positive direction - Int_t TOFSectors[18]={-1,-1,0,0,0,-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0}; + // Int_t TOFSectors[18]={-1,-1,0,0,0,-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0}; + // Partial geometry: modules at 1,2,6,7,9,10,11,12,15,16,17 + // (ALICE numbering convention) + Int_t TOFSectors[18]={-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0,-1,-1,0,0,0}; TOF->SetTOFSectors(TOFSectors); } - if (iRICH) + if (iHMPID) { - //=================== RICH parameters =========================== - AliRICH *RICH = new AliRICHv1("RICH", "normal RICH"); + //=================== HMPID parameters =========================== + AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID"); } @@ -558,10 +519,10 @@ void Config() AliPMD *PMD = new AliPMDv1("PMD", "normal PMD"); } - if (iSTART) + if (iT0) { - //=================== START parameters ============================ - AliSTART *START = new AliSTARTv1("START", "START Detector"); + //=================== T0 parameters ============================ + AliT0 *T0 = new AliT0v1("T0", "T0 Detector"); } if (iEMCAL) @@ -570,15 +531,15 @@ void Config() AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG"); } - if (iCRT) + if (iACORDE) { - //=================== CRT parameters ============================ - AliCRT *CRT = new AliCRTv0("CRT", "normal ACORDE"); + //=================== ACORDE parameters ============================ + AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE"); } if (iVZERO) { - //=================== CRT parameters ============================ + //=================== ACORDE parameters ============================ AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO"); } } @@ -757,9 +718,10 @@ AliGenerator* MbCocktail() jpsi->SetPhiRange(0., 360.); jpsi->SetForceDecay(kAll); // -// +// + gener->AddGenerator(jpsi, "J/Psi", 8.e-4); gener->AddGenerator(pythia, "Pythia", 1.); - gener->AddGenerator(jpsi, "J/Psi", 8.e-4); + return gener; }