New default geometry descriptions: HMPIDv2 and ITSv11Hybrid

[u/mrichter/AliRoot.git] / macros / ConfigPPR.C

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 807f8a4d2556ecf8fde431615d9f53b08ffe7fdc..332acd7cecdeb78447cc4b37a12aaa67212a0544 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -40,11 +40,11 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.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"
@@ -119,11 +119,17 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 // 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 PprMag_t smag  = k5kG;
+static PprGeo_t geo   = kHoles;
 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 +143,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun);
 AliGenHijing* HijingStandard();
 AliGenGeVSim* GeVSimStandard(Float_t, Float_t);
 void ProcessEnvironmentVars();
+void LoadPythia();
 
 void Config()
 {
@@ -150,8 +157,10 @@ void Config()
     gRandom->SetSeed(sseed);
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
-
-   // libraries required by geant321
+    // Load Pythia libraries
+    LoadPythia();
+    
+    // libraries required by geant321
 #if defined(__CINT__)
     gSystem->Load("libgeant321");
 #endif
@@ -345,6 +354,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
     }
 
     if (iSHIL)
@@ -366,7 +380,7 @@ void Config()
     {
        //=================== ITS parameters ============================
 
-       AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
     }
 
     if (iTPC)
@@ -385,7 +399,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -394,7 +408,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
     }
 
     if (iTRD)
@@ -1556,3 +1570,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
+}