Using geometrywith holes (Annalisa)

[u/mrichter/AliRoot.git] / test / PbPbbench / Config.C

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index af3cf0c70486a4f2c3c0c768df7ada9615255bbc..291807e0caef673d16e87716186d3d16c4afb3af 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -44,7 +44,7 @@
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv2.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv2.h"

-#include "ZDC/AliZDCv2.h"
+#include "ZDC/AliZDCv3.h"

 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"


@@ -119,6 +119,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
     "p-p","Pb-Pb"
 };
 

+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+

 // This part for configuration    
 
 static PprRun_t srun = kHijing_per2;
 // This part for configuration    
 
 static PprRun_t srun = kHijing_per2;


@@ -126,6 +131,7 @@ static PprRad_t srad = kGluonRadiation;
 static PprMag_t smag = k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 static PprTrigConf_t strig = kDefaultPbPbTrig; // default pp trigger configuration
 static PprMag_t smag = k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 static PprTrigConf_t strig = kDefaultPbPbTrig; // default pp trigger configuration

+static PprGeo_t geo = kHoles;

 
 // Comment line 
 static TString  comment;
 
 // Comment line 
 static TString  comment;


@@ -336,6 +342,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");

+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }

     }
 
     if (iSHIL)
     }
 
     if (iSHIL)


@@ -353,60 +364,11 @@ void Config()
         AliPIPE *PIPE = new AliPIPEv3("PIPE", "Beam Pipe");
     }
  
         AliPIPE *PIPE = new AliPIPEv3("PIPE", "Beam Pipe");
     }
  

-    if(iITS) {
+    if (iITS)
+    {
+        //=================== ITS parameters ============================

 
 

-    //=================== 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");
-    //

        AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
        AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("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 [100,300]
-       ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [100,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
-
-    // 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(0);                // 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(0);                // 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);  

     }
 
     if (iTPC)
     }
 
     if (iTPC)


@@ -434,7 +396,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
     {
         //=================== ZDC parameters ============================
 

-        AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");

     }
 
     if (iTRD)
     }
 
     if (iTRD)