X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFconfig.C;h=7b637efe2aa677bc07f9f28e116b7cb315ab89ed;hb=c687d49a98a03b68b28474105b41f8df28d86d21;hp=31fb6941fd3ab889ee8b63d407f3f8bf67890a70;hpb=b384f8a4048b9062acaa97c615e16ae51416fdb1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFconfig.C b/TOF/AliTOFconfig.C
index 31fb6941fd3..7b637efe2aa 100644
--- 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"
@@ -36,7 +36,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv1.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv3.h"
 #endif
 
@@ -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 AliMagF::BMap_t smag = AliMagF::k5kG;
 
 // Comment line 
 static TString  comment;
@@ -170,15 +164,14 @@ void Config()
     gener->SetVertexSmear(kPerEvent); 
     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");
     }
-    
+    */
     
     if (srad == kGluonRadiation)
     {
@@ -199,11 +192,17 @@ void Config()
     printf("\n \n Comment: %s \n \n", comment.Data());
     
     
-// Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., smag);
-    field->SetL3ConstField(0); //Using const. field in the barrel
-    rl->CdGAFile();
-    gAlice->SetField(field);    
+// Field (L3 +-0.2/0.5 T)
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",-1,-1, AliMagF::k5kG)); // +0.5/-0.7
+    /*
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 1, AliMagF::k5kG)); // -0.5/-0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps",-1,-1, AliMagF::k2kG)); // +0.2/-0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 1, AliMagF::k2kG)); // -0.2/+0.7
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 0, AliMagF::k5kG)); // +-0.5/0
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 1, 0, AliMagF::k2kG)); // +-0.2/0
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 0, 0, AliMagF::k5kGUniform)); // 0/0
+    */
+
 //
     Int_t   iABSO   = 0;
     Int_t   iDIPO   = 0;
@@ -453,7 +452,7 @@ void Config()
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)