Several Changes:

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

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index f1e2aaed49d614a699a7ea0683d0531ca3509f2c..5240b3b19db31850255c76f1836570f0014784e0 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -19,10 +19,10 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymm.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
+#include "HMPID/AliHMPIDv3.h"
 #include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -33,11 +33,7 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-static PprGeo_t geo = kHoles;
+void LoadPythia();
 
 void Config()
 {
@@ -52,7 +48,8 @@ void Config()
   //  gRandom->SetSeed(seed);
   gRandom->SetSeed(12345);
   cerr<<"Seed for random number generation= "<<seed<<endl; 
-
+  // Load Pythia libraries
+  LoadPythia();
    // libraries required by geant321
 #if defined(__CINT__)
     gSystem->Load("libgeant321");
@@ -225,12 +222,7 @@ void Config()
     //=================== FRAME parameters ============================
 
     AliFRAME *FRAME  = new AliFRAMEv2("FRAME","Space Frame");
-    if (geo == kHoles) {
-      FRAME->SetHoles(1);
-    } else {
-      FRAME->SetHoles(0);
-    }
-
+    FRAME->SetHoles(1);
   }
 
   if(iSHIL) {
@@ -251,7 +243,7 @@ void Config()
   {
     //=================== ITS parameters ============================
 
-    AliITSvPPRasymm *ITS  = new AliITSvPPRasymm("ITS","New ITS PPR detailed version with asymmetric services");
+    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
   }
   
 
@@ -268,7 +260,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv3("HMPID","normal HMPID");    
 
   }
 
@@ -334,3 +326,12 @@ void Config()
 
          
 }
+
+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
+}