X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfig.C;h=8966f4744da6c8ec6343311a97841138547e4073;hb=e191bb57c96a66bf4f60381b9a3f8c511bc6188e;hp=6760cae8a1434fc18353fad7f96bd995f138614b;hpb=e1cd8da1f938454e8e2c3080b38fec7f52985e36;p=u%2Fmrichter%2FAliRoot.git

diff --git a/macros/Config.C b/macros/Config.C
index 6760cae8a14..8966f4744da 100644
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -27,19 +27,22 @@
 #include "STRUCT/AliPIPEv0.h"
 #include "ITS/AliITSvPPRasymmFMD.h"
 #include "TPC/AliTPCv2.h"
-#include "TOF/AliTOFv2FHoles.h"
 #include "TOF/AliTOFv4T0.h"
-#include "RICH/AliRICHv3.h"
+#include "RICH/AliRICHv1.h"
 #include "ZDC/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
+#include "MUON/AliMUONSt1GeometryBuilder.h"
+#include "MUON/AliMUONSt2GeometryBuilder.h"
+#include "MUON/AliMUONSlatGeometryBuilder.h"
+#include "MUON/AliMUONTriggerGeometryBuilder.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
 #include "EMCAL/AliEMCALv1.h"
 #include "CRT/AliCRTv0.h"
-#include "VZERO/AliVZEROv2.h"
+#include "VZERO/AliVZEROv3.h"
 #endif
 
 Float_t EtaToTheta(Float_t arg);
@@ -71,7 +74,7 @@ void Config()
 
     cout<<"Config.C: Creating Run Loader ..."<<endl;
     rl = AliRunLoader::Open("galice.root",
-			    AliConfig::fgkDefaultEventFolderName,
+			    AliConfig::GetDefaultEventFolderName(),
 			    "recreate");
     if (rl == 0x0)
       {
@@ -328,19 +331,15 @@ void Config()
 
 
     if (iTOF) {
-	if (geo == kHoles) {
         //=================== TOF parameters ============================
-	    AliTOF *TOF = new AliTOFv2FHoles("TOF", "TOF with Holes");
-	} else {
-	    AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
-	}
+	AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
     }
 
 
     if (iRICH)
     {
         //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv3("RICH", "normal RICH");
+        AliRICH *RICH = new AliRICHv1("RICH", "normal RICH");
 
     }
 
@@ -381,6 +380,10 @@ void Config()
         //=================== MUON parameters ===========================
 
         AliMUON *MUON = new AliMUONv1("MUON", "default");
+	MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilder(MUON));
+	MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilder(MUON));
+	MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
+	MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
     }
     //=================== PHOS parameters ===========================
 
@@ -405,7 +408,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "G56_2_55_19_104_14");
+        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
     }
 
      if (iCRT)
@@ -417,7 +420,7 @@ void Config()
      if (iVZERO)
     {
         //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv2("VZERO", "normal VZERO");
+        AliVZERO *VZERO = new AliVZEROv3("VZERO", "normal VZERO");
     }
 
      cout << "End of Config.C" << endl;