Minor changes

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

diff --git a/TOF/AliTOFconfig.C b/TOF/AliTOFconfig.C
index 99fb1061923c955c90dd586bfb38d6e3a9997782..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"
@@ -34,9 +34,9 @@
 #include "MUON/AliMUONv1.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
-#include "START/AliSTARTv1.h"
+#include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv1.h"
-#include "CRT/AliCRTv0.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 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;
@@ -218,14 +210,14 @@ void Config()
     Int_t   iPMD    = 0;
     Int_t   iHMPID   = 0;
     Int_t   iSHIL   = 0;
-    Int_t   iSTART  = 0;
+    Int_t   iT0  = 0;
     Int_t   iTOF    = 1;
     Int_t   iTPC    = 1;
     Int_t   iTRD    = 1;
     Int_t   iZDC    = 0;
     Int_t   iEMCAL  = 0;
     Int_t   iVZERO  = 0;
-    Int_t   iCRT    = 0;
+    Int_t   iACORDE    = 0;
 
     //=================== Alice BODY parameters =============================
     AliBODY *BODY = new AliBODY("BODY", "Alice envelop");
@@ -438,10 +430,10 @@ void Config()
         AliPMD *PMD = new AliPMDv1("PMD", "normal PMD");
     }
 
-    if (iSTART)
+    if (iT0)
     {
-        //=================== START parameters ============================
-        AliSTART *START = new AliSTARTv1("START", "START Detector");
+        //=================== T0 parameters ============================
+        AliT0 *T0 = new AliT0v1("T0", "T0 Detector");
     }
 
     if (iEMCAL)
@@ -450,15 +442,15 @@ void Config()
         AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "G56_2_55_19");
     }
 
-     if (iCRT)
+     if (iACORDE)
     {
-        //=================== CRT parameters ============================
-        AliCRT *CRT = new AliCRTv0("CRT", "normal ACORDE");
+        //=================== ACORDE parameters ============================
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
     {
-        //=================== CRT parameters ============================
+        //=================== ACORDE parameters ============================
         AliVZERO *VZERO = new AliVZEROv3("VZERO", "normal VZERO");
     }