Using geometrywith holes (Annalisa)

diff --git a/test/PbPbbench/Config.C b/test/PbPbbench/Config.C
index 33aff27..291807e 100644 (file)
--- a/test/PbPbbench/Config.C
+++ b/test/PbPbbench/Config.C
@@ -119,6 +119,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 // 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 PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -336,6 +342,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/test/PbPbbench/rec.C b/test/PbPbbench/rec.C
index ded54ed..05c02ff 100644 (file)
--- a/test/PbPbbench/rec.C
+++ b/test/PbPbbench/rec.C
@@ -7,6 +7,7 @@ void rec() {
   AliTPCRecoParam * tpcRecoParam = AliTPCRecoParam::GetHighFluxParam();
   AliTPCReconstructor::SetRecoParam(tpcRecoParam);
   //  AliTPCReconstructor::SetStreamLevel(1);
+  reco.SetRunVertexFinderTracks(kFALSE);
 
   TStopwatch timer;
   timer.Start();

diff --git a/test/PbPbbench/recraw/rec.C b/test/PbPbbench/recraw/rec.C
index b37029f..5cd73b9 100644 (file)
--- a/test/PbPbbench/recraw/rec.C
+++ b/test/PbPbbench/recraw/rec.C
@@ -18,6 +18,7 @@ void rec() {
   reco.SetInput("raw.root");
 
   reco.SetNumberOfEventsPerFile(-1); // all events in one single file
+  reco.SetRunVertexFinderTracks(kFALSE);
 
   TStopwatch timer;
   timer.Start();

diff --git a/test/genkine/sim/Config.C b/test/genkine/sim/Config.C
index 41b4c4a..072600a 100644 (file)
--- a/test/genkine/sim/Config.C
+++ b/test/genkine/sim/Config.C
@@ -78,6 +78,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 // This part for configuration    
 
 static PprRad_t srad = kGluonRadiation;
@@ -85,6 +90,7 @@ static PprMag_t smag = k5kG;
 static Int_t    sseed = 12345; //Set 0 to use the current time
 
 static PprTrigConf_t strig = kDefaultPPTrig; // default PbPb trigger configuration
+static PprGeo_t geo = kHoles;
 // Comment line 
 static TString  comment;
 
@@ -292,6 +298,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/test/gun/Config.C b/test/gun/Config.C
index 45655c0..8754333 100644 (file)
--- a/test/gun/Config.C
+++ b/test/gun/Config.C
@@ -54,9 +54,15 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 Float_t EtaToTheta(Float_t arg);
 
 static PprTrigConf_t strig = kDefaultPPTrig;// default PP trigger configuration
+static PprGeo_t geo = kHoles;
 
 void Config()
 {
@@ -335,6 +341,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/test/merge/backgr/Config.C b/test/merge/backgr/Config.C
index 94fe296..671dad3 100644 (file)
--- a/test/merge/backgr/Config.C
+++ b/test/merge/backgr/Config.C
@@ -120,6 +120,11 @@ 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 = kHijing_per4;
@@ -129,6 +134,7 @@ TDatime dat;
 static Int_t    sseed = dat.Get(); //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
+static PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -340,6 +346,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/test/merge/signal/Config.C b/test/merge/signal/Config.C
index 0f7ea47..9f37a14 100644 (file)
--- a/test/merge/signal/Config.C
+++ b/test/merge/signal/Config.C
@@ -120,6 +120,11 @@ 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 = kPythia6;
@@ -129,6 +134,7 @@ TDatime dat;
 static Int_t    sseed = dat.Get(); //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
+static PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -340,6 +346,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/test/ppbench/Config.C b/test/ppbench/Config.C
index 6da4f44..924556c 100644 (file)
--- a/test/ppbench/Config.C
+++ b/test/ppbench/Config.C
@@ -119,6 +119,11 @@ const char * pprTrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
+enum PprGeo_t
+  {
+    kHoles, kNoHoles
+  };
+
 // This part for configuration    
 
 static PprRun_t srun = kPythia6;
@@ -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 = kDefaultPPTrig; // default pp trigger configuration
+static PprGeo_t geo = kHoles;
 
 // Comment line 
 static TString  comment;
@@ -336,6 +342,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/test/pploadlibs/Config.C b/test/pploadlibs/Config.C
index af9e90a..f0266a9 100644 (file)
--- a/test/pploadlibs/Config.C
+++ b/test/pploadlibs/Config.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 //
 //========================//
@@ -407,6 +413,11 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
+        if (geo == kHoles) {
+         FRAME->SetHoles(1);
+       } else {
+         FRAME->SetHoles(0);
+       }
     }
 
     if (iSHIL)