The present commit corresponds to an important change in the way the

[u/mrichter/AliRoot.git] / test / pploadlibs / Config.C

diff --git a/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index 7cb7ae678cb45e39edcc715ca87a443996064bc9..40ca712509ee70bfd18d182b8d2aa0c409a72b11 100644 (file)
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.C
@@ -23,7 +23,7 @@
 #include "STEER/AliConfig.h"
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFCheb.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -80,12 +80,6 @@ enum YCut_t
 {
   kFull, kBarrel, kMuonArm
 };
-//--- Magnetic Field ---
-enum Mag_t
-{
-    k2kG, k4kG, k5kG
-};
-
 //--- Trigger config ---
 enum TrigConf_t
 {
@@ -106,7 +100,7 @@ void ProcessEnvironmentVars();
 static PDC06Proc_t   proc     = kPyMbNoHvq;
 static DecayHvFl_t   decHvFl  = kNature; 
 static YCut_t        ycut     = kFull;
-static Mag_t         mag      = k5kG; 
+static AliMagF::BMap_t mag    = AliMagF::k5kG; 
 static TrigConf_t    trig     = kDefaultPPTrig; // default pp trigger configuration
 //========================//
 // Set Random Number seed //
@@ -333,20 +327,17 @@ void Config()
 
   // FIELD
   //    
-  if (mag == k2kG) {
+  if (mag == AliMagF::k2kG) {
     comment = comment.Append(" | L3 field 0.2 T");
-  } else if (mag == k4kG) {
-    comment = comment.Append(" | L3 field 0.4 T");
-  } else if (mag == k5kG) {
+  } else if (mag == AliMagF::k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagFCheb* field = new AliMagFCheb("Maps","Maps", 2, 1., 10., mag);
+  AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., mag);
+  TGeoGlobalMagField::Instance()->SetField(field);
+  
   rl->CdGAFile();
-  gAlice->SetField(field);    
-
-
 
   Int_t iABSO  = 1;
   Int_t iACORDE   = 0;