Using getter instead of global constant

[u/mrichter/AliRoot.git] / macros / ConfigHBT.C

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index ca4af645a94a813cd268f4eb99ef7eb6e11932e0..c2fc45d6e25ee2442502b7548b8ec88c90c0c93b 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -35,12 +35,15 @@
 #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/AliCRTv1.h"
-#include "VZERO/AliVZEROv2.h"
 #endif
 
 void Config()
@@ -56,7 +59,7 @@ void Config()
     new     TGeant3("C++ Interface to Geant3");
 
     cout<<"Config.C: Creating Run Loader ..."<<endl;
-    AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::fgkDefaultEventFolderName,
+    AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::GetDefaultEventFolderName(),
                                               "recreate");
     if (rl == 0x0)
       {
@@ -454,6 +457,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 ===========================
 
@@ -478,7 +485,7 @@ void Config()
     if (iEMCAL && !iRICH)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCALArch1a");
+        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCAL_55_25");
     }
 
     if (iSTART)