Minor changes

[u/mrichter/AliRoot.git] / TOF / AliTOFconfig.C

diff --git a/TOF/AliTOFconfig.C b/TOF/AliTOFconfig.C
index 8170a5e64076f088bbb187de65364ece287bd313..7fdc63c6a1cf59f2d70b99cd26b7848bb09ebb2e 100644 (file)
--- a/TOF/AliTOFconfig.C
+++ b/TOF/AliTOFconfig.C
@@ -15,7 +15,7 @@
 #include "EVGEN/AliGenSlowNucleons.h"
 #include "EVGEN/AliSlowNucleonModelExp.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv0.h"
@@ -61,18 +61,12 @@ enum PprRad_t
     kGluonRadiation, kNoGluonRadiation
 };
 
-enum PprMag_t
-{
-    k2kG, k4kG, k5kG
-};
-
-
 // This part for configuration    
 static PprRun_t srun = test50;
 //static PprRun_t srun = kPythia6;
 static PprGeo_t sgeo = kNoHoles;
 static PprRad_t srad = kGluonRadiation;
-static PprMag_t smag = k5kG;
+static BMap_t smag = AliMagF::k5kG;
 
 // Comment line 
 static TString  comment;
@@ -171,11 +165,9 @@ void Config()
     gener->SetTrackingFlag(1);
     gener->Init();
     
-    if (smag == k2kG) {
+    if (smag == AliMagF::k2kG) {
        comment = comment.Append(" | L3 field 0.2 T");
-    } else if (smag == k4kG) {
-       comment = comment.Append(" | L3 field 0.4 T");
-    } else if (smag == k5kG) {
+    } else if (smag == AliMagF::k5kG) {
        comment = comment.Append(" | L3 field 0.5 T");
     }
     
@@ -200,10 +192,10 @@ void Config()
     
     
 // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
+    AliMagF* field = new AliMagF("Maps","Maps", 2, 1., 1., 10., smag));
+    TGeoGlobalMagField::Instance()->SetField(field);
     field->SetL3ConstField(0); //Using const. field in the barrel
     rl->CdGAFile();
-    gAlice->SetField(field);    
 //
     Int_t   iABSO   = 0;
     Int_t   iDIPO   = 0;