Adding initialisation of globals, will not be needed on Tiger

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

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index a93e045e0c13a1db493eecdc9b64a78a839a9d5f..5c09b8995e30fe51ec8a4c91e898a8263c21d56e 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -20,7 +20,7 @@ void ConfigCommon(Bool_t interactiveSetup)
   // Create the output file
   AliRunLoader* rl = 0;
   rl = AliRunLoader::Open("galice.root",
-                          AliConfig::fgkDefaultEventFolderName,
+                          AliConfig::GetDefaultEventFolderName(),
                           "recreate");
   if (!rl) {
     gAlice->Fatal("Config.C","Can not instatiate the Run Loader");
@@ -149,7 +149,6 @@ void ConfigCommon(Bool_t interactiveSetup)
   // Exclude detectors with temporary problem
   iCRT = 0;
   iEMCAL = 0;
-  iFMD = 0;
  
   // END OF ONLY FOR GEANT4
 
@@ -204,7 +203,7 @@ void ConfigCommon(Bool_t interactiveSetup)
     {
         //=================== SHIL parameters ============================
 
-        AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding");
+        AliSHIL *SHIL = new AliSHILv2("SHIL", "Shielding Version 2");
     }
 
 
@@ -293,25 +292,21 @@ void ConfigCommon(Bool_t interactiveSetup)
         AliTPC *TPC = new AliTPCv2("TPC", "Default");
 
         // All sectors included 
-        TPC->SetSecAL(-1);
         TPC->SetSecAU(-1);
+        TPC->SetSecAL(-1);
 
     }
 
     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");
     }
 
 
@@ -352,6 +347,10 @@ 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 ===========================
 
@@ -376,7 +375,7 @@ void ConfigCommon(Bool_t interactiveSetup)
     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)
@@ -389,7 +388,7 @@ void ConfigCommon(Bool_t interactiveSetup)
     if (iVZERO)
     {
         //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv2("VZERO", "normal VZERO");
+        AliVZERO *VZERO = new AliVZEROv3("VZERO", "normal VZERO");
     }
 
   } // end (!isSetInteractively)
@@ -400,6 +399,8 @@ void ConfigCommon(Bool_t interactiveSetup)
     else  
       AliRunConfiguration::SwitchHoles(kFALSE);
   }    
+
+  cout << "End of g4ConfigCommon.C" << endl;
 }
 
 Float_t EtaToTheta(Float_t arg){