Corner modules removed and charge particled included in HITS

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

diff --git a/macros/g4ConfigCommon1.C b/macros/g4ConfigCommon1.C
index ea0df78bc7e2cc2288c684bbab6f46c5997592fc..877a2e3ce6d1ed82332cf9a0359b73b74023e911 100644 (file)
--- a/macros/g4ConfigCommon1.C
+++ b/macros/g4ConfigCommon1.C
@@ -50,7 +50,7 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
   // Trigger configuration
   //=======================================================================
 
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
   // ============================= 
@@ -65,7 +65,7 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
       comment = comment.Append(" | L3 field 0.5 T");
   }
   // OK
-  AliMagF* field = new AliMagF("Maps","Maps", 2, -1., -1., 10., smag);
+  AliMagF* field = new AliMagF("Maps","Maps", -1., -1., smag);
   TGeoGlobalMagField::Instance()->SetField(field);
 
   printf("\n \n Comment: %s \n \n", comment.Data());
@@ -181,7 +181,7 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
   {
       //=================== ITS parameters ============================
 
-      AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+      AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
 
   if (iTPC)
@@ -277,8 +277,8 @@ void ConfigCommon1(Bool_t setRootGeometry = kTRUE)
 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
 }