New default geometry descriptions: HMPIDv2 and ITSv11Hybrid

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

diff --git a/test/merge/signal/Config.C b/test/merge/signal/Config.C
index 9f37a14d21aca39d19cb8a5f45abe213aa3c8554..1d88bc3f8ab7725815d9c4786c5bf5247b392f2b 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"
@@ -159,9 +159,13 @@ 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("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
 #endif
 
     new     TGeant3TGeo("C++ Interface to Geant3");
@@ -372,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)
@@ -391,7 +395,7 @@ void Config()
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }