Extra header added to the list

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

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index d59e6f0d7cdfcfd849d37b6d6d5ff51350826986..2dcf4002347046145a179f08ccba07e6054ae1bd 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -43,7 +43,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
   }
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     // Set Random Number seed
@@ -80,8 +80,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
   // ============================= 
 
     // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
-    gAlice->SetField(field);    
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1., 1., AliMagF::k5kG));
 
     Int_t   iABSO  =  1;
     Int_t   iDIPO  =  1;
@@ -194,7 +193,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
     {
         //=================== ITS parameters ============================
 
-       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+       AliITS *ITS  = new AliITSv11("ITS","ITS v11");
     }
 
     if (iTPC)
@@ -273,7 +272,7 @@ void ConfigCommon(Bool_t setRootGeometry = kTRUE)
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
@@ -295,8 +294,8 @@ Float_t EtaToTheta(Float_t arg){
 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
 }