Minor changes

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

diff --git a/TOF/AliTOFconfig.C b/TOF/AliTOFconfig.C
index 2768d4c6b6c4595610ee3e9fafd914c88b15343e..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"
@@ -27,17 +27,17 @@
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv4T0.h"
-#include "RICH/AliRICHv3.h"
+#include "HMPID/AliHMPIDv1.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #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 "VZERO/AliVZEROv2.h"
+#include "ACORDE/AliACORDEv1.h"
+#include "VZERO/AliVZEROv3.h"
 #endif
 
 enum PprRun_t 
@@ -61,17 +61,12 @@ enum PprRad_t
     kGluonRadiation, kNoGluonRadiation
 };
 
-enum PprMag_t
-{
-    k2kG, k4kG, k5kG
-};
-
-
 // This part for configuration    
 static PprRun_t srun = test50;
-static PprGeo_t sgeo = kHoles;
+//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;
@@ -102,7 +97,7 @@ void Config()
 
     cout<<"Config.C: Creating Run Loader ..."<<endl;
     rl = AliRunLoader::Open("galice.root",
-                           AliConfig::fgkDefaultEventFolderName,
+                           AliConfig::GetDefaultEventFolderName(),
                            "recreate");
     if (rl == 0x0)
       {
@@ -170,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");
     }
     
@@ -189,20 +182,20 @@ void Config()
 
     if (sgeo == kHoles)
     {
-       comment = comment.Append(" | Holes for PHOS/RICH");
+       comment = comment.Append(" | Holes for PHOS/HMPID");
        
     } else {
-       comment = comment.Append(" | No holes for PHOS/RICH");
+       comment = comment.Append(" | No holes for PHOS/HMPID");
     }
 
     printf("\n \n Comment: %s \n \n", comment.Data());
     
     
 // 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;
@@ -215,16 +208,16 @@ void Config()
     Int_t   iPHOS   = 0;
     Int_t   iPIPE   = 1;
     Int_t   iPMD    = 0;
-    Int_t   iRICH   = 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");
@@ -372,13 +365,16 @@ void Config()
     }
 
 
-    if (iTOF) AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
+    if (iTOF) {
+        //=================== TOF parameters ============================
+       AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
+    }
 
 
-    if (iRICH)
+    if (iHMPID)
     {
-        //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv3("RICH", "normal RICH");
+        //=================== HMPID parameters ===========================
+        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
 
     }
 
@@ -401,8 +397,8 @@ void Config()
        if (sgeo == kHoles) {
            // With hole in front of PHOS
            TRD->SetPHOShole();
-           // With hole in front of RICH
-           TRD->SetRICHhole();
+           // With hole in front of HMPID
+           TRD->SetHMPIDhole();
        }
            // Switch on TR
            AliTRDsim *TRDsim = TRD->CreateTR();
@@ -434,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)
@@ -446,16 +442,16 @@ 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 ============================
-        AliVZERO *VZERO = new AliVZEROv2("VZERO", "normal VZERO");
+        //=================== ACORDE parameters ============================
+        AliVZERO *VZERO = new AliVZEROv3("VZERO", "normal VZERO");
     }
  
              
@@ -481,8 +477,8 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetMomentumRange(0, 999999.);
        gener->SetPhiRange(0., 360.);
        // Set pseudorapidity range from -8 to 8.
-       Float_t thmin = EtaToTheta(8);   // theta min. <---> eta max
-       Float_t thmax = EtaToTheta(-8);  // theta max. <---> eta min 
+       Float_t thmin = EtaToTheta(1);   // theta min. <---> eta max
+       Float_t thmax = EtaToTheta(-1);  // theta max. <---> eta min 
        gener->SetThetaRange(thmin,thmax);
        gGener=gener;
       }