New MUON geometry definition. Removing debug option and updating Config_MUON_test...

diff --git a/MUON/AliMUONSlatGeometryBuilder.cxx b/MUON/AliMUONSlatGeometryBuilder.cxx
index 49382dc969e80ebb3f93c7224ff6286e51f58faa..b5a2a30b66961525835acba55b2b03903f1cd0cd 100644 (file)
--- a/MUON/AliMUONSlatGeometryBuilder.cxx
+++ b/MUON/AliMUONSlatGeometryBuilder.cxx
@@ -194,7 +194,7 @@ void AliMUONSlatGeometryBuilder::CreateGeometry()
      iChamber1 = iChamber;
      iChamber2 = GetChamber(5);
      
-     iChamber1->GetGeometry()->SetDebug(kTRUE);
+     //iChamber1->GetGeometry()->SetDebug(kTRUE);
      //iChamber2->GetGeometry()->SetDebug(kTRUE);
 
      if (gAlice->GetModule("DIPO")) {

diff --git a/MUON/Config_MUON_test.C b/MUON/Config_MUON_test.C
index 700f94994ca8e732c5f89be065ec674ede80287b..d15fa732d34d4661b9d9094713b8dd97beecbc0d 100644 (file)
--- a/MUON/Config_MUON_test.C
+++ b/MUON/Config_MUON_test.C
@@ -128,15 +128,15 @@ void Config(char directory[100]="", char option[6]="box")
   //=================== Alice BODY parameters =============================
   AliBODY *BODY = new AliBODY("BODY","Alice envelop");
   //=================== ABSO parameters ============================
-  //AliABSO *ABSO = new AliABSOv0("ABSO", "Muon Absorber");
+  AliABSO *ABSO = new AliABSOv0("ABSO", "Muon Absorber");
   //=================== DIPO parameters ============================
-  //AliDIPO *DIPO = new AliDIPOv2("DIPO", "Dipole version 2");
+  AliDIPO *DIPO = new AliDIPOv2("DIPO", "Dipole version 2");
   //================== HALL parameters ============================
- // AliHALL *HALL = new AliHALL("HALL", "Alice Hall");
+  AliHALL *HALL = new AliHALL("HALL", "Alice Hall");
   //=================== PIPE parameters ============================
-  //AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe");
+  AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe");
   //=================== SHIL parameters ============================
-  //AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2");
+  AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2");
   //=================== MUON Subsystem ===========================
   cout << ">>> Config_MUON_test.C: Creating AliMUONv1 ..."<<endl;
  
@@ -146,10 +146,10 @@ void Config(char directory[100]="", char option[6]="box")
   // New MUONv1 version (geometry defined via builders)
   AliMUON *MUON = new AliMUONv1("MUON", "default");
   //MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilder(MUON));
-  //MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(MUON));
-  //MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilder(MUON));
+  MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilderV2(MUON));
+  MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilder(MUON));
   MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
-  //MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
+  MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
 }
 
 Float_t EtaToTheta(Float_t arg){