QA validation macro and script

[u/mrichter/AliRoot.git] / test / genkine / sim / Config.C

diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index fab2fafaaba3933cd421ea0c67ddedf28094f044..46296006389e6566f4c2c735e5dd3e5c8b68d309 100644 (file)
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/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"
@@ -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"
 #include "EVGEN/AliGenExtFile.h"
 #include "EVGEN/AliGenReaderTreeK.h"
@@ -78,10 +78,6 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
 
 // This part for configuration    
 
@@ -90,7 +86,6 @@ static PprMag_t smag = k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 
 static PprTrigConf_t strig = kDefaultPPTrig; // default PbPb trigger configuration
-static PprGeo_t geo = kHoles;
 // Comment line 
 static TString  comment;
 
@@ -111,11 +106,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");
@@ -302,11 +297,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)
@@ -328,7 +319,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)
@@ -347,7 +338,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -401,13 +392,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)