Fixing a compilation warning

[u/mrichter/AliRoot.git] / EMCAL / macros / Config.C

diff --git a/EMCAL/macros/Config.C b/EMCAL/macros/Config.C
index bb6f6c55cbad8c54fd9c8234fc7bee1311729016..4868042b6253a58c8355c96ea7f5edc3b8526547 100755 (executable)
--- a/EMCAL/macros/Config.C
+++ b/EMCAL/macros/Config.C
@@ -17,7 +17,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"
@@ -38,7 +38,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
 
@@ -47,6 +47,8 @@ void    LoadPythia();
 
 void Config()
 {
+  //AliLog::SetGlobalDebugLevel(2);
+
     // ThetaRange is (0., 180.). It was (0.28,179.72) 7/12/00 09:00
     // Theta range given through pseudorapidity limits 22/6/2001
 
@@ -150,9 +152,7 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // 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", 2, 1., 1., 10., AliMagF::k5kG));
 
     Int_t   iABSO  =  0;
     Int_t   iDIPO  =  0;
@@ -308,13 +308,16 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+        //AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_PDC06");
+        //AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE pbTh=0.144 scTh=0.176");
+        //AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)