X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfig_PDC06.C;h=3caf5627ad56e63e4a214bf6b0a9e927a618ba1d;hb=b83f84f0c00c248bda8026e80aa7cca671a87d95;hp=ee4854bc1e7ecc470c771df942e879115be8611d;hpb=458041af69fedded73c6b024a98be5b221a49c20;p=u%2Fmrichter%2FAliRoot.git diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C index ee4854bc1e7..3caf5627ad5 100644 --- a/macros/Config_PDC06.C +++ b/macros/Config_PDC06.C @@ -23,7 +23,7 @@ #include "STEER/AliConfig.h" #include "PYTHIA6/AliDecayerPythia.h" #include "PYTHIA6/AliGenPythia.h" -#include "STEER/AliMagFMaps.h" +#include "STEER/AliMagF.h" #include "STRUCT/AliBODY.h" #include "STRUCT/AliMAG.h" #include "STRUCT/AliABSOv3.h" @@ -33,11 +33,11 @@ #include "STRUCT/AliSHILv3.h" #include "STRUCT/AliPIPEv3.h" #include "ITS/AliITSgeom.h" -#include "ITS/AliITSvPPRasymmFMD.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" @@ -45,7 +45,7 @@ #include "PMD/AliPMDv1.h" #include "T0/AliT0v1.h" #include "EMCAL/AliEMCALv2.h" -#include "ACORDE/AliACORDEv0.h" +#include "ACORDE/AliACORDEv1.h" #include "VZERO/AliVZEROv7.h" #endif @@ -80,12 +80,6 @@ enum YCut_t { kFull, kBarrel, kMuonArm }; -//--- Magnetic Field --- -enum Mag_t -{ - k2kG, k4kG, k5kG -}; - //--- Trigger config --- enum TrigConf_t { @@ -97,16 +91,18 @@ const char * TrigConfName[] = { }; //--- Functions --- +class AliGenPythia; AliGenPythia *PythiaHVQ(PDC06Proc_t proc); AliGenerator *MbCocktail(); AliGenerator *PyMbTriggered(Int_t pdg); void ProcessEnvironmentVars(); +void LoadPythia(); // This part for configuration static PDC06Proc_t proc = kPyMbNoHvq; static DecayHvFl_t decHvFl = kNature; static YCut_t ycut = kFull; -static Mag_t mag = k5kG; +static AliMagF::BMap_t mag = AliMagF::k5kG; static TrigConf_t trig = kDefaultPPTrig; // default pp trigger configuration //========================// // Set Random Number seed // @@ -147,10 +143,13 @@ static TString comment; void Config() { - + // Get settings from environment variables ProcessEnvironmentVars(); + // Load pythia libraries + LoadPythia(); + // gRandom->SetSeed(seed); cerr<<"Seed for random number generation= "<IsDefaultStorageSet()){ - AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT"); + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); AliCDBManager::Instance()->SetRun(0); } @@ -189,7 +188,7 @@ void Config() // gAlice->SetGeometryFromCDB(); // Set the trigger configuration - gAlice->SetTriggerDescriptor(TrigConfName[trig]); + AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]); cout<<"Trigger configuration is set to "<SetL3ConstField(0); //Using const. field in the barrel - rl->CdGAFile(); - gAlice->SetField(field); - + TGeoGlobalMagField::Instance()->SetField(field); + rl->CdGAFile(); Int_t iABSO = 1; Int_t iACORDE = 0; @@ -414,6 +410,7 @@ void Config() //=================== FRAME parameters ============================ AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); + FRAME->SetHoles(1); } if (iSHIL) @@ -431,60 +428,11 @@ void Config() 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"); - // - 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 (iITS) + { + //=================== ITS parameters ============================ + + AliITS *ITS = new AliITSv11Hybrid("ITS","ITS v11Hybrid"); } if (iTPC) @@ -497,20 +445,13 @@ void Config() if (iTOF) { //=================== TOF parameters ============================ 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}; - // 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 (iHMPID) { //=================== HMPID parameters =========================== - AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID"); + AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID"); } @@ -519,7 +460,7 @@ void Config() { //=================== ZDC parameters ============================ - AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC"); + AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC"); } if (iTRD) @@ -577,13 +518,13 @@ void Config() if (iEMCAL) { //=================== EMCAL parameters ============================ - AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG"); + AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE"); } if (iACORDE) { //=================== ACORDE parameters ============================ - AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE"); + AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE"); } if (iVZERO) @@ -808,3 +749,11 @@ void ProcessEnvironmentVars() +void LoadPythia() +{ + // Load Pythia related libraries + gSystem->Load("liblhapdf.so"); // Parton density functions + gSystem->Load("libEGPythia6.so"); // TGenerator interface + gSystem->Load("libpythia6.so"); // Pythia + gSystem->Load("libAliPythia6.so"); // ALICE specific implementations +}