Final TOF version: 18 modules with holes for PHOS (Annalisa)

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

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 0cca098233df94ad567a770f92eeebda0820186b..60fea6f8dcf668184f0e8f3498083b216a19fa6f 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -32,10 +32,10 @@
 #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 "HMPID/AliHMPIDv3.h"
 #include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -78,12 +78,9 @@ enum TrigConf_t
 const char * TrigConfName[] = {
     "p-p","Pb-Pb"
 };
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
 
 //--- Functions ---
+class AliGenPythia;
 AliGenPythia *PythiaHVQ(ProcessHvFl_t proc);
 void          LoadPythia();
 
@@ -94,7 +91,6 @@ static DecayHvFl_t   decHvFl  = kNature;
 static YCut_t        ycut     = kFull;
 static Mag_t         mag      = k5kG; 
 static TrigConf_t    trig     = kDefaultPbPbTrig; // default PbPb trigger configuration
-static PprGeo_t      geo      = kHoles;
 // nEvts = -1  : you get 1 QQbar pair and all the fragmentation and 
 //               decay chain
 // nEvts = N>0 : you get N charm / beauty Hadrons 
@@ -372,12 +368,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) {
@@ -397,7 +388,7 @@ void Config()
   if(iITS) {
     //=================== ITS parameters ============================
 
-    AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
   }
   
 
@@ -414,7 +405,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv3("HMPID","normal HMPID");    
 
   }