Some cleanup in the makefiles

[u/mrichter/AliRoot.git] / TPHIC / ConfigTPHIC.C

diff --git a/TPHIC/ConfigTPHIC.C b/TPHIC/ConfigTPHIC.C
index 492bfa926bddd83a83186726d1c01e5a93223b55..4d7a65d5f3351077cd3ec3199d379c5c691d753e 100644 (file)
--- a/TPHIC/ConfigTPHIC.C
+++ b/TPHIC/ConfigTPHIC.C
@@ -86,9 +86,8 @@ void Config()
     //
     //gener->SetVertexSmear(perTrack); 
     // Field (L3 0.4 T)
-    AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., 1);
+    TGeoGlobalMagField::Instance()->SetField(new AliMagF("Maps","Maps", 2, 1., 1., 10., AliMagF::k5kG));
     rootfile->cd();
-    gAlice->SetField(field);    
 
 
     Int_t   iABSO  =  0;
@@ -102,15 +101,15 @@ void Config()
     Int_t   iPHOS  =  0;
     Int_t   iPIPE  =  0;
     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   =  0;
     Int_t   iTPC   =  0;
     Int_t   iTRD   =  0;
     Int_t   iZDC   =  0;
     Int_t   iEMCAL =  0;
-    Int_t   iCRT   =  0;
+    Int_t   iACORDE   =  0;
     Int_t   iVZERO =  0;
 
     //=================== Alice BODY parameters =============================
@@ -280,10 +279,10 @@ void Config()
     }
 
 
-    if (iRICH)
+    if (iHMPID)
     {
-        //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv3("RICH", "normal RICH");
+        //=================== HMPID parameters ===========================
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -306,8 +305,8 @@ void Config()
        if (geo == 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();
@@ -343,27 +342,27 @@ 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)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "G56_2_55_19_104_14");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
-     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 AliVZEROv2("VZERO", "normal VZERO");
     }