Simplified initioalization of MUON

diff --git a/TFluka/macro/FlukaConfig.C b/TFluka/macro/FlukaConfig.C
index 09717e8e719cff702729e8709201ea521537bfb5..2655dcb5ae0bdc5ba0fa1c324d2d2f5857215fac 100644 (file)
--- a/TFluka/macro/FlukaConfig.C
+++ b/TFluka/macro/FlukaConfig.C
@@ -376,10 +376,6 @@ 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 ===========================
                                                                                 

diff --git a/macros/Config.C b/macros/Config.C
index c85047f22297afe9665f983253052369cc581042..5f04ff0c22d12ba87785442dd02415865bc9ecbf 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -33,10 +33,6 @@
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
-#include "MUON/AliMUONSt1GeometryBuilderV2.h"
-#include "MUON/AliMUONSt2GeometryBuilderV2.h"
-#include "MUON/AliMUONSlatGeometryBuilder.h"
-#include "MUON/AliMUONTriggerGeometryBuilder.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
@@ -359,11 +355,6 @@ void Config()
         //=================== MUON parameters ===========================
         // New MUONv1 version (geometry defined via builders)
         AliMUON *MUON = new AliMUONv1("MUON", "default");
-       ((AliMUONv1*)MUON)->SetStepManagerVersionDE(true);
-       MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(MUON));
-       MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilderV2(MUON));
-       MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
-       MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
     }
     //=================== PHOS parameters ===========================
 

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index c31e04b72f42a2e6bf7757b24b9f7c895495b977..cc1ade0537050ad460daee3d2c65fd5acac17d9a 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -27,10 +27,6 @@
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.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"
@@ -354,10 +350,6 @@ void Config()
   if(iMUON) {
     //=================== 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 ===========================

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 57165bd4e9e196390f66691dcf22d54186584d16..ed6f98dff3e68de4e205a66d13a177d7350c3dcc 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -27,10 +27,6 @@
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.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"
@@ -353,10 +349,6 @@ void Config()
   if(iMUON) {
     //=================== 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 ===========================

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index aa9dc5e8693252ce3a44b45a0c292d570c977f3e..256b1729e417578f44e979bba105b524bacdb670 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -35,10 +35,6 @@
 #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"
@@ -435,10 +431,6 @@ 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 ===========================
 

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index d4b8dbf34f83e48b15d85cc382a3efb8d37ea54c..b61437982590b59d88739a12fed5cade04992da5 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -48,10 +48,6 @@
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
-#include "MUON/AliMUONSt1GeometryBuilderV2.h"
-#include "MUON/AliMUONSt2GeometryBuilderV2.h"
-#include "MUON/AliMUONSlatGeometryBuilder.h"
-#include "MUON/AliMUONTriggerGeometryBuilder.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
@@ -477,11 +473,6 @@ void Config()
         //=================== MUON parameters ===========================
         // New MUONv1 version (geometry defined via builders)
         AliMUON *MUON = new AliMUONv1("MUON", "default");
-       ((AliMUONv1*)MUON)->SetStepManagerVersionDE(true);
-       MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(MUON));
-       MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilderV2(MUON));
-       MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
-       MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
     }
     //=================== PHOS parameters ===========================
 

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index 4a39ec2d2f423dac4aaeb661fdb7f9cb3f38ddfc..111f201487d68f10f8bb7599d88017e16bb8481b 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -325,10 +325,6 @@ void ConfigCommon(Bool_t interactiveSetup)
         //=================== 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 ===========================