more on dir creation

[u/mrichter/AliRoot.git] / test / merge / backgr / Config.C

diff --git a/test/merge/backgr/Config.C b/test/merge/backgr/Config.C
index 855c5e8f4290fd34a0f1a7162a27ae7799b88f32..c6e6d80390f5040c4fb3dafa525318b6c7e0cbf1 100644 (file)
--- a/test/merge/backgr/Config.C
+++ b/test/merge/backgr/Config.C
@@ -53,7 +53,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
 
@@ -120,11 +120,6 @@ 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 = kHijing_per4;
@@ -134,7 +129,6 @@ TDatime dat;
 static Int_t    sseed = dat.Get(); //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
-static PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -161,11 +155,11 @@ void Config()
 
    // libraries required by geant321 and Pythia6
 #if defined(__CINT__)
-    gSystem->Load("libgeant321");
     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
+    gSystem->Load("libgeant321");
 #endif
 
     new     TGeant3TGeo("C++ Interface to Geant3");
@@ -350,11 +344,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)
@@ -449,13 +439,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)