Adding the branch for the upgrade studies

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

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index 9dd2464872f29dcc40879c87dc3d9443e8739d5e..f026337b8a8fef07a7719746204210a527062d4f 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -6,6 +6,7 @@
 
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
+#include <TPDGCode.h>
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
@@ -27,11 +28,11 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
-#include "ZDC/AliZDCv1.h"
+#include "HMPID/AliHMPIDv3.h"
+#include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -42,13 +43,6 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-
-static PprGeo_t geo = kHoles;
-
 void Config()
 {
     // Set Random Number seed
@@ -62,7 +56,7 @@ void Config()
     new     TGeant3TGeo("C++ Interface to Geant3");
 
     if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+      AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
       AliCDBManager::Instance()->SetRun(0);
     }
 
@@ -81,7 +75,7 @@ void Config()
     // gAlice->SetGeometryFromCDB();
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //
@@ -164,7 +158,7 @@ void Config()
    // g1->SetMomentumRange(0, 3);
    // g1->SetOrigin(0,0,0);        //vertex position
    // g1->SetSigma(0,0,0);         //Sigma in (X,Y,Z) (cm) on IP position
-   // g1->SetPart(310);        //K0short(310), Lambda(3122)
+   // g1->SetPart(kK0Short);        //K0short(310), Lambda(3122)
    
 
     /*****************     M E V S I M    ********************************/    
@@ -299,12 +293,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)
@@ -326,7 +315,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-        AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+        AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
   
 
@@ -345,7 +334,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -354,7 +343,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv1("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
     }
 
     if (iACORDE)
@@ -407,7 +396,7 @@ void Config()
     if (iEMCAL && !iHMPID)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
     if (iT0)