Initialization of the AliITSgeom object: code cleanup. The object is no longer stored...

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

diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C
index 462252fad9092cb9b06a647863c248e6eed70593..9bbe28dd590645cfe595200c586e37997bbadc66 100644 (file)
--- a/macros/g4ConfigCommon.C
+++ b/macros/g4ConfigCommon.C
@@ -5,11 +5,6 @@
 
 Float_t EtaToTheta(Float_t arg);
 static Int_t    eventsPerRun = 100;
-enum PprGeo_t 
-{
-    kHoles, kNoHoles
-};
-static PprGeo_t geo = kHoles;
 
 void ConfigCommon(Bool_t interactiveSetup)
 {
@@ -133,21 +128,21 @@ void ConfigCommon(Bool_t interactiveSetup)
   Int_t iPHOS  = 1;
   Int_t iPIPE  = 1;
   Int_t iPMD   = 1;
-  Int_t iRICH  = 1;
+  Int_t iHMPID  = 1;
   Int_t iSHIL  = 1;
-  Int_t iSTART = 1;
+  Int_t iT0 = 1;
   Int_t iTOF   = 1;
   Int_t iTPC   = 1;
   Int_t iTRD   = 1;
   Int_t iZDC   = 1;
   Int_t iEMCAL = 1;
-  Int_t iCRT   = 0;  
+  Int_t iACORDE   = 0;  
   Int_t iVZERO = 1;
 
   // ONLY FOR GEANT4
 
   // Exclude detectors with temporary problem
-  iCRT = 0;
+  iACORDE = 0;
   iEMCAL = 0;
  
   // END OF ONLY FOR GEANT4
@@ -192,11 +187,6 @@ void ConfigCommon(Bool_t interactiveSetup)
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-       if (geo == kHoles) {
-           FRAME->SetHoles(1);
-       } else {
-           FRAME->SetHoles(0);
-       }
     }
 
     if (iSHIL)
@@ -234,12 +224,12 @@ void ConfigCommon(Bool_t interactiveSetup)
 /*
        AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","ITS PPR detailed version with asymmetric services");
        ITS->SetMinorVersion(2);  // don't touch this parameter if you're not an ITS developer
-       ITS->SetReadDet(kTRUE);   // don't touch this parameter if you're not an ITS developer
+       ITS->SetReadDet(kFALSE);          // don't touch this parameter if you're not an ITS developer
        //    ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det");  // don't touch this parameter if you're not an ITS developer
        ITS->SetThicknessDet1(200.);   // detector thickness on layer 1 must be in the range [100,300]
        ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [100,300]
-       ITS->SetThicknessChip1(200.);  // chip thickness on layer 1 must be in the range [150,300]
-       ITS->SetThicknessChip2(200.);  // chip thickness on layer 2 must be in the range [150,300]
+       ITS->SetThicknessChip1(150.);  // chip thickness on layer 1 must be in the range [150,300]
+       ITS->SetThicknessChip2(150.);  // chip thickness on layer 2 must be in the range [150,300]
        ITS->SetRails(0);              // 1 --> rails in ; 0 --> rails out
        ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
 */
@@ -281,10 +271,10 @@ void ConfigCommon(Bool_t interactiveSetup)
        AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF");
     }
 
-    if (iRICH)
+    if (iHMPID)
     {
-        //=================== RICH parameters ===========================
-        AliRICH *RICH = new AliRICHv1("RICH", "normal RICH");
+        //=================== HMPID parameters ===========================
+        AliHMPID *HMPID = new AliHMPIDv1("HMPID", "normal HMPID");
     }
 
 
@@ -303,12 +293,6 @@ void ConfigCommon(Bool_t interactiveSetup)
 
         // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2)
         TRD->SetGasMix(1);
-       if (geo == kHoles) {
-           // With hole in front of PHOS
-           TRD->SetPHOShole();
-           // With hole in front of RICH
-           TRD->SetRICHhole();
-       }
         // Switch on TR
         AliTRDsim *TRDsim = TRD->CreateTR();
     }
@@ -340,39 +324,32 @@ void ConfigCommon(Bool_t interactiveSetup)
         AliPMD *PMD = new AliPMDv1("PMD", "normal PMD");
     }
 
-    if (iSTART)
+    if (iT0)
     {
-        //=================== START parameters ============================
-        AliSTART *START = new AliSTARTv1("START", "START Detector");
+        //=================== T0 parameters ============================
+        AliT0 *T0 = new AliT0v1("T0", "T0 Detector");
     }
 
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
     }
 
-    if (iCRT)
+    if (iACORDE)
     {
-        //=================== CRT parameters ============================
+        //=================== ACORDE parameters ============================
 
-        AliCRT *CRT = new AliCRTv0("CRT", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
     }
 
     if (iVZERO)
     {
-        //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv6("VZERO", "normal VZERO");
+        //=================== ACORDE parameters ============================
+        AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }
 
   } // end (!isSetInteractively)
-  else {
-  
-    if (geo == kHoles) 
-      AliRunConfiguration::SwitchHoles(kTRUE);
-    else  
-      AliRunConfiguration::SwitchHoles(kFALSE);
-  }    
 
   cout << "End of g4ConfigCommon.C" << endl;
 }