X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FConfigKr.C;h=dda1da48af1dc21fbcc6613348ebfbe8d0625959;hb=6a62da73fb1ac261f88e15bf2ed2f5172012ad8b;hp=dd4826834be063e1c5ec14510539b6141253a4ed;hpb=8224b11df53551dd0fbb008f869af4cec49cf093;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/ConfigKr.C b/TPC/ConfigKr.C
index dd4826834be..dda1da48af1 100644
--- a/TPC/ConfigKr.C
+++ b/TPC/ConfigKr.C
@@ -16,7 +16,7 @@
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "EVGEN/AliGenCocktail.h"
 #include "EVGEN/AliGenHIJINGpara.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -37,7 +37,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -77,7 +77,7 @@ void Config()
     gAlice->SetRunLoader(rl);
 
     // Set the trigger configuration
-    gAlice->SetTriggerDescriptor("Pb-Pb");
+    AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
     cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
     //
@@ -134,8 +134,7 @@ void Config()
     gener->Init();
 
     // 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));
 
     // detectors - only the TPC is relevant
 
@@ -347,7 +346,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)