- Welding section on absorber side (LHCVC2C_001)

[u/mrichter/AliRoot.git] / MUON / Config_MUON_test.C

diff --git a/MUON/Config_MUON_test.C b/MUON/Config_MUON_test.C
index 8569b6c0ce8749ac2f903a6131f230e455e3305a..cc124bece1a3ecb4f015ce4a5faa4e24be012acd 100644 (file)
--- a/MUON/Config_MUON_test.C
+++ b/MUON/Config_MUON_test.C
@@ -21,7 +21,7 @@ void Config(char directory[100]="", char option[6]="box")
   cout << ">>> Config_MUON_test.C: Creating Run Loader ..."<<endl;
   AliRunLoader* rl=0x0;
   rl = AliRunLoader::Open(
-       filename, AliConfig::fgkDefaultEventFolderName, "recreate");
+       filename, AliConfig::GetDefaultEventFolderName(), "recreate");
   if (rl == 0x0) {
     gAlice->Fatal("Config_MUON_test.C","Can not instatiate the Run Loader");
     return;
@@ -87,7 +87,7 @@ void Config(char directory[100]="", char option[6]="box")
   if (!strcmp(option,"box")) {
     AliGenBox * gener = new AliGenBox(1);
     gener->SetMomentumRange(20.,20.1);
-    gener->SetPhiRange(-180, 180.01);         
+    gener->SetPhiRange(0., 360.);         
     gener->SetThetaRange(171.000,178.001);
     gener->SetPart(13);           // Muons
     gener->SetOrigin(0.,0., 0.);  //vertex position
@@ -111,15 +111,15 @@ void Config(char directory[100]="", char option[6]="box")
     AliGenParam *gener = new AliGenParam(1, AliGenMUONlib::kUpsilon);
     gener->SetMomentumRange(0,999);
     gener->SetPtRange(0,100.);
-    gener->SetPhiRange(-180, 180);
+    gener->SetPhiRange(0., 360.);
     gener->SetCutOnChild(1);
+    gener->SetChildPhiRange(0.,360.);
     gener->SetChildThetaRange(171.0,178.0);
     gener->SetOrigin(0,0,0);          //vertex position    gener->SetSigma(0,0,0);           //Sigma in (X,Y,Z) (cm) on IP position
     gener->SetForceDecay(kDiMuon);
     gener->SetTrackingFlag(1);
     gener->Init();
   }
-     
   //============================================================= 
   // Field (L3 0.4 T)
   AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 1, 1., 10., AliMagFMaps::k4kG);
@@ -127,11 +127,29 @@ 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");
+  //=================== DIPO parameters ============================
+  AliDIPO *DIPO = new AliDIPOv2("DIPO", "Dipole version 2");
+  //================== HALL parameters ============================
+  AliHALL *HALL = new AliHALL("HALL", "Alice Hall");
+  //=================== PIPE parameters ============================
+  AliPIPE *PIPE = new AliPIPEv0("PIPE", "Beam Pipe");
+  //=================== SHIL parameters ============================
+  AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2");
   //=================== MUON Subsystem ===========================
-   cout << ">>> Config_MUON_test.C: Creating AliMUONv1 ..."<<endl;
-   AliMUONv1 *MUON  = new AliMUONv1("MUON","default"); 
+  cout << ">>> Config_MUON_test.C: Creating AliMUONv1 ..."<<endl;
+ 
+  // Old MUONv1 version (renamed to MUONv3)
+  //AliMUONv3 *MUON  = new AliMUONv3("MUON","default"); 
+  
+  // 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 AliMUONSlatGeometryBuilder(MUON));
+  MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
 }
 
 Float_t EtaToTheta(Float_t arg){