TOF geometry with holes in front of three PHOS modules (Annalisa, Silvia)

diff --git a/macros/Config.C b/macros/Config.C
index 07bcf3547adea3fdf6b4061bf6e5607ce755499e..28e80da27b0d3ab3f48575e88167a06df0891bc3 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -41,6 +41,12 @@
 #include "VZERO/AliVZEROv7.h"
 #endif
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+static PprGeo_t geo = kHoles;
+
 Float_t EtaToTheta(Float_t arg);
 
 void Config()
@@ -227,6 +233,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
     }
 
     if (iSHIL)

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 3c5728322974c6b246017fc9daa6b726666de987..021cedaec790bc5289cd9396a05e681336bb7ccf 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -33,6 +33,12 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+static PprGeo_t geo = kHoles;
+
 void Config()
 {
  
@@ -220,6 +226,11 @@ void Config()
     //=================== FRAME parameters ============================
 
     AliFRAME *FRAME  = new AliFRAMEv2("FRAME","Space Frame");
+    if (geo == kHoles) {
+      FRAME->SetHoles(1);
+    } else {
+      FRAME->SetHoles(0);
+    }
 
   }
 

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 7d7026b459786d9ce3c8771b243d867a234db776..725a88b7cbedb124a1f7d7df76b1f4f35ff4c682 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -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);
+    }
 
   }
 

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index cd5b4afdb2eb0b4c1ddac935113f02bb3704e171..9dd2464872f29dcc40879c87dc3d9443e8739d5e 100644 (file)
--- a/macros/ConfigHBT.C
+++ b/macros/ConfigHBT.C
@@ -42,6 +42,13 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
+static PprGeo_t geo = kHoles;
+
 void Config()
 {
     // Set Random Number seed
@@ -292,6 +299,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAME *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
 
     }
 

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index 807f8a4d2556ecf8fde431615d9f53b08ffe7fdc..95dced18d1d0615abc7f1c12ed342b243d7abc9d 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -119,11 +119,17 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 // This part for configuration    
 //static PprRun_t srun = test50;
-static PprRun_t srun = kHIJINGplus;
-static PprRad_t srad = kGluonRadiation;
-static PprMag_t smag = k5kG;
+static PprRun_t srun  = kHIJINGplus;
+static PprRad_t srad  = kGluonRadiation;
+static PprMag_t smag  = k5kG;
+static PprGeo_t geo   = kHoles;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 //static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
 static PprTrigConf_t strig = kDefaultPbPbTrig; // default PbPb trigger configuration
@@ -345,6 +351,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
     }
 
     if (iSHIL)

diff --git a/macros/Config_AliGenCosmicsParam.C b/macros/Config_AliGenCosmicsParam.C
index 8a21410ac34c518ff5efcf4e63873aace3729297..0a36406b8b98c252aecc23d761215bcc02fc408b 100644 (file)
--- a/macros/Config_AliGenCosmicsParam.C
+++ b/macros/Config_AliGenCosmicsParam.C
@@ -48,9 +48,15 @@ enum Mag_t
     k2kG, k4kG, k5kG
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 Float_t EtaToTheta(Float_t arg);
 
 static Mag_t         mag      = k5kG; 
+static PprGeo_t      geo      = kHoles;
 
 void Config()
 {
@@ -233,6 +239,12 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
+
     }
 
     if (iSHIL)

diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index 12eeabeb4eb4c7cf01560116ec7eae7eaad773ad..06f50e26b586de6ccf58047d1a1c9b9dd27e3669 100644 (file)
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -96,6 +96,11 @@ const char * TrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 //--- Functions ---
 AliGenPythia *PythiaHVQ(PDC06Proc_t proc);
 AliGenerator *MbCocktail();
@@ -108,6 +113,7 @@ static DecayHvFl_t   decHvFl  = kNature;
 static YCut_t        ycut     = kFull;
 static Mag_t         mag      = k5kG; 
 static TrigConf_t    trig     = kDefaultPPTrig; // default pp trigger configuration
+static PprGeo_t geo = kHoles;
 //========================//
 // Set Random Number seed //
 //========================//
@@ -414,6 +420,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
     }
 
     if (iSHIL)
@@ -448,13 +459,12 @@ void Config()
     if (iTOF) {
         //=================== TOF parameters ============================
        AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
-       // Partial geometry: modules at 2,3,4,6,7,11,12,14,15,16
-       // starting at 6h in positive direction
-       //      Int_t TOFSectors[18]={-1,-1,0,0,0,-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0};
-       // Partial geometry: modules at 1,2,6,7,9,10,11,12,15,16,17
-       // (ALICE numbering convention)
-               Int_t TOFSectors[18]={-1,0,0,-1,-1,-1,0,0,-1,0,0,0,0,-1,-1,0,0,0};
-       TOF->SetTOFSectors(TOFSectors);
+       // Partial geometry:
+       // starting at 3h in anticlock-wise direction
+       // looking from A side (ALICE numbering convention),
+       // modules at 1,2,6,7,9,10,11,12,15,16,17
+               //Int_t TOFSectors[18]={0,0,0,-1,-1,-1,0,0,0,0,0,0,-1,-1,-1,0,0,0};
+       //TOF->SetTOFSectors(TOFSectors);
     }
 
 

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 96e8d6a4fcb92b71d6efecc89d9af884401683d3..2543a7aa35bb3dadc38020f06e6dc246ae062229 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -78,6 +78,11 @@ enum TrigConf_t
 const char * TrigConfName[] = {
     "p-p","Pb-Pb"
 };
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 //--- Functions ---
 AliGenPythia *PythiaHVQ(ProcessHvFl_t proc);
 
@@ -88,6 +93,7 @@ static DecayHvFl_t   decHvFl  = kNature;
 static YCut_t        ycut     = kFull;
 static Mag_t         mag      = k5kG; 
 static TrigConf_t    trig     = kDefaultPbPbTrig; // default PbPb trigger configuration
+static PprGeo_t      geo      = kHoles;
 // nEvts = -1  : you get 1 QQbar pair and all the fragmentation and 
 //               decay chain
 // nEvts = N>0 : you get N charm / beauty Hadrons 
@@ -364,6 +370,11 @@ void Config()
     //=================== FRAME parameters ============================
 
     AliFRAME *FRAME  = new AliFRAMEv2("FRAME","Space Frame");
+    if (geo == kHoles) {
+      FRAME->SetHoles(1);
+    } else {
+      FRAME->SetHoles(0);
+    }
 
   }