ACORDEv1 is now the default

[u/mrichter/AliRoot.git] / test / ppbench / Config.C

diff --git a/test/ppbench/Config.C b/test/ppbench/Config.C
index 924556caec168e01518338df74b49a1323b915fa..4474041db24e829c45f061bedcd2965900406212 100644 (file)
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -40,10 +40,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/AliFMDv1.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
 
@@ -119,11 +119,6 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-
 // This part for configuration    
 
 static PprRun_t srun = kPythia6;
@@ -131,7 +126,6 @@ static PprRad_t srad = kGluonRadiation;
 static PprMag_t smag = k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
-static PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -158,6 +152,10 @@ void Config()
 
    // libraries required by geant321
 #if defined(__CINT__)
+    gSystem->Load("liblhapdf");
+    gSystem->Load("libEGPythia6");
+    gSystem->Load("libpythia6");
+    gSystem->Load("libAliPythia6");
     gSystem->Load("libgeant321");
 #endif
 
@@ -342,11 +340,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-        if (geo == kHoles) {
-         FRAME->SetHoles(1);
-       } else {
-         FRAME->SetHoles(0);
-       }
+       FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -368,7 +362,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)
@@ -387,7 +381,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -441,13 +435,13 @@ 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)