X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfigPPR.C;h=6babd08e355deb7dd05314dbdb192f3122d8c54a;hb=ec6e635345a030dc256a85bfb212137830296ae7;hp=cc3ae5bc4fc2061ed4a106b932fe9aac18936c9e;hpb=b384f8a4048b9062acaa97c615e16ae51416fdb1;p=u%2Fmrichter%2FAliRoot.git diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C index cc3ae5bc4fc..6babd08e355 100644 --- a/macros/ConfigPPR.C +++ b/macros/ConfigPPR.C @@ -31,20 +31,20 @@ #include "EVGEN/AliGenGeVSim.h" #include "EVGEN/AliGeVSimParticle.h" #include "PYTHIA6/AliGenPythia.h" -#include "STEER/AliMagFMaps.h" +#include "STEER/AliMagF.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/AliITSv11.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv5T0.h" -#include "HMPID/AliHMPIDv1.h" -#include "ZDC/AliZDCv2.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" @@ -52,7 +52,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 @@ -105,11 +105,6 @@ enum PprRad_t kGluonRadiation, kNoGluonRadiation }; -enum PprMag_t -{ - k2kG, k4kG, k5kG -}; - enum PprTrigConf_t { kDefaultPPTrig, kDefaultPbPbTrig @@ -121,9 +116,9 @@ const char * pprTrigConfName[] = { // This part for configuration //static PprRun_t srun = test50; -static PprRun_t srun = kHIJINGplus; -static PprRad_t srad = kGluonRadiation; -static PprMag_t smag = k5kG; +static PprRun_t srun = kHIJINGplus; +static PprRad_t srad = kGluonRadiation; +static AliMagF::BMap_t smag = AliMagF::k5kG; static Int_t sseed = 12345; //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 @@ -137,6 +132,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun); AliGenHijing* HijingStandard(); AliGenGeVSim* GeVSimStandard(Float_t, Float_t); void ProcessEnvironmentVars(); +void LoadPythia(); void Config() { @@ -150,14 +146,21 @@ void Config() gRandom->SetSeed(sseed); cout<<"Seed for random number generation= "<GetSeed()<Load("libgeant321"); #endif new TGeant3TGeo("C++ Interface to Geant3"); + if(!AliCDBManager::Instance()->IsDefaultStorageSet()){ + AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB"); + AliCDBManager::Instance()->SetRun(0); + } + AliRunLoader* rl=0x0; AliLog::Message(AliLog::kInfo, "Creating Run Loader", "", "", "Config()"," ConfigPPR.C", __LINE__); @@ -173,9 +176,11 @@ void Config() rl->SetCompressionLevel(2); rl->SetNumberOfEventsPerFile(3); gAlice->SetRunLoader(rl); + // gAlice->SetGeometryFromFile("geometry.root"); + // gAlice->SetGeometryFromCDB(); // Set the trigger configuration - gAlice->SetTriggerDescriptor(pprTrigConfName[strig]); + AliSimulation::Instance()->SetTriggerConfig(pprTrigConfName[strig]); cout<<"Trigger configuration is set to "<SetTrackingFlag(1); gener->Init(); - if (smag == k2kG) { + if (smag == AliMagF::k2kG) { comment = comment.Append(" | L3 field 0.2 T"); - } else if (smag == k4kG) { - comment = comment.Append(" | L3 field 0.4 T"); - } else if (smag == k5kG) { + } else if (smag == AliMagF::k5kG) { comment = comment.Append(" | L3 field 0.5 T"); } @@ -272,10 +275,11 @@ void Config() // Field (L3 0.4 T) - AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag); + AliMagF* field = new AliMagF("Maps","Maps", 1., 1., smag); field->SetL3ConstField(0); //Using const. field in the barrel + TGeoGlobalMagField::Instance()->SetField(field); + rl->CdGAFile(); - gAlice->SetField(field); // Int_t iABSO = 1; Int_t iDIPO = 1; @@ -315,21 +319,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"); } @@ -338,13 +342,14 @@ void Config() //=================== FRAME parameters ============================ AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); + FRAME->SetHoles(1); } if (iSHIL) { //=================== SHIL parameters ============================ - AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2"); + AliSHIL *SHIL = new AliSHILv3("SHIL", "Shielding Version 3"); } @@ -352,63 +357,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 AliITSv11("ITS","ITS v11"); } if (iTPC) @@ -420,14 +376,14 @@ 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"); } @@ -436,7 +392,7 @@ void Config() { //=================== ZDC parameters ============================ - AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC"); + AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC"); } if (iTRD) @@ -481,18 +437,18 @@ 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) { - //=================== ACORDE parameters ============================ + //=================== VZERO parameters ============================ AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO"); } @@ -1428,7 +1384,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) { AliGenSTRANGElib *lib = new AliGenSTRANGElib(); Int_t particle; // Xi - particle = AliGenSTRANGElib::kXiMinus; + particle = kXiMinus; AliGenParam *genXi = new AliGenParam(16,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle)); genXi->SetPtRange(0., 12.); genXi->SetYRange(-1.1, 1.1); @@ -1436,7 +1392,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) { // // Omega - particle = AliGenSTRANGElib::kOmegaMinus; + particle = kOmegaMinus; AliGenParam *genOmega = new AliGenParam(10,particle,lib->GetPt(particle),lib->GetY(particle),lib->GetIp(particle)); genOmega->SetPtRange(0, 12.); genOmega->SetYRange(-1.1, 1.1); @@ -1598,3 +1554,13 @@ void ProcessEnvironmentVars() sseed = atoi(gSystem->Getenv("CONFIG_SEED")); } } + + +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 +}