X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=macros%2FConfigCharmPPR.C;h=725a88b7cbedb124a1f7d7df76b1f4f35ff4c682;hp=2ffd68faf5622960af36d684d42f1bb9d71d7aac;hb=6b612c2da5d841214af8ea5e2a0c0e82946ffe6e;hpb=458041af69fedded73c6b024a98be5b221a49c20

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 2ffd68faf56..725a88b7cbe 100644
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -22,7 +22,7 @@
 #include "ITS/AliITSvPPRasymm.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv1.h"
+#include "HMPID/AliHMPIDv2.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -33,6 +33,12 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+static PprGeo_t geo = kHoles;
+
 void Config()
 {
  
@@ -219,6 +225,11 @@ void Config()
     //=================== FRAME parameters ============================
 
     AliFRAME *FRAME  = new AliFRAMEv2("FRAME","Space Frame");
+    if (geo == kHoles) {
+      FRAME->SetHoles(1);
+    } else {
+      FRAME->SetHoles(0);
+    }
 
   }
 
@@ -236,60 +247,11 @@ void Config()
   }
 
 
-  if(iITS) {
-
-//=================== ITS parameters ============================
-    //
-    // As the innermost detector in ALICE, the Inner Tracking System "impacts" on
-    // almost all other detectors. This involves the fact that the ITS geometry
-    // still has several options to be followed in parallel in order to determine
-    // the best set-up which minimizes the induced background. All the geometries
-    // available to date are described in the following. Read carefully the comments
-    // and use the default version (the only one uncommented) unless you are making
-    // comparisons and you know what you are doing. In this case just uncomment the
-    // ITS geometry you want to use and run Aliroot.
-    //
-    // Detailed geometries:         
-    //
-    //
-    //AliITS *ITS  = new AliITSv5symm("ITS","Updated ITS TDR detailed version with symmetric services");
-    //
-    //AliITS *ITS  = new AliITSv5asymm("ITS","Updates ITS TDR detailed version with asymmetric services");
-    //
+  if (iITS)
+  {
+    //=================== ITS parameters ============================
+
     AliITSvPPRasymm *ITS  = new AliITSvPPRasymm("ITS","New ITS PPR detailed version with asymmetric services");
-    ITS->SetMinorVersion(2);                                         // 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 [150,300]
-    ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [150,300]
-    ITS->SetThicknessChip1(150.);  // chip thickness on layer 1 must be in the range [100,300]
-    ITS->SetThicknessChip2(150.);  // chip thickness on layer 2 must be in the range [100,300]
-    ITS->SetRails(1);	           // 1 --> rails in ; 0 --> rails out
-    ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
-    //
-    // Coarse geometries (warning: no hits are produced with these coarse geometries and they unuseful 
-    // for reconstruction !):
-    //                                                     
-    //
-    //AliITSvPPRcoarseasymm *ITS  = new AliITSvPPRcoarseasymm("ITS","New ITS PPR coarse version with asymmetric services");
-    //ITS->SetRails(1);                // 1 --> rails in ; 0 --> rails out
-    //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
-    //
-    //AliITS *ITS  = new AliITSvPPRcoarsesymm("ITS","New ITS PPR coarse version with symmetric services");
-    //ITS->SetRails(1);                // 1 --> rails in ; 0 --> rails out
-    //ITS->SetSupportMaterial(0);      // 0 --> Copper ; 1 --> Aluminum ; 2 --> Carbon
-    //                      
-    //
-    //
-    // Geant3 <-> EUCLID conversion
-    // ============================
-    //
-    // SetEUCLID is a flag to output (=1) or not to output (=0) both geometry and
-    // media to two ASCII files (called by default ITSgeometry.euc and
-    // ITSgeometry.tme) in a format understandable to the CAD system EUCLID.
-    // The default (=0) means that you dont want to use this facility.
-    //
-    ITS->SetEUCLID(0);  
   }
   
 
@@ -306,7 +268,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv1("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
 
   }