Load libgeant321 after the Pythia related libraries

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

diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C
index 0f7ea474dc58c2f03f9c9a3ef3d2cb9b93aec895..9004c84069230d3934e28b183e70f0d01ceaf272 100644 (file)
--- a/test/merge/signal/Config.C
+++ b/test/merge/signal/Config.C
@@ -41,10 +41,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"
@@ -120,6 +120,11 @@ 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 = kPythia6;
@@ -129,6 +134,7 @@ 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;
@@ -153,8 +159,12 @@ void Config()
     cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
 
 
-   // libraries required by geant321
+   // libraries required by geant321 and Pythia6
 #if defined(__CINT__)
+    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
 
@@ -340,6 +350,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
     }
 
     if (iSHIL)
@@ -361,7 +376,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)
@@ -380,7 +395,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }