Changes for Root6 (Mikolaj)

[u/mrichter/AliRoot.git] / macros / ConfigCharmPPR.C

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index cf44e9eb97932c1b8155b18029691c91a183ae06..f484249f85fff5e8ae566fc26bb72d075e42f8ce 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -19,7 +19,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -83,7 +83,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
   //
@@ -243,7 +243,7 @@ void Config()
   {
     //=================== ITS parameters ============================
 
-    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 
@@ -330,8 +330,8 @@ void Config()
 void LoadPythia()
 {
     // Load Pythia related libraries
-    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("liblhapdf");      // Parton density functions
+    gSystem->Load("libEGPythia6");   // TGenerator interface
+    gSystem->Load("libpythia6");     // Pythia
+    gSystem->Load("libAliPythia6");  // ALICE specific implementations
 }