From e90f1c57b3c7cb9f599929b9e744e5fe722af00c Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 6 Apr 2006 09:21:28 +0000 Subject: [PATCH] No holes in the FRAME, TOF and TRD --- macros/Config.C | 20 ++------------------ macros/ConfigBeautyPPR.C | 4 ---- macros/ConfigCharmPPR.C | 4 ---- macros/ConfigHBT.C | 4 ---- macros/ConfigPPR.C | 29 ++--------------------------- macros/Config_PDC06.C | 1 - macros/Config_PythiaHeavyFlavours.C | 4 ---- macros/g4ConfigCommon.C | 23 ----------------------- 8 files changed, 4 insertions(+), 85 deletions(-) diff --git a/macros/Config.C b/macros/Config.C index e6294a6fb6b..d29fc824962 100644 --- a/macros/Config.C +++ b/macros/Config.C @@ -42,11 +42,6 @@ #endif Float_t EtaToTheta(Float_t arg); -enum PprGeo_t -{ - kHoles, kNoHoles -}; -static PprGeo_t geo = kHoles; void Config() { @@ -221,11 +216,6 @@ void Config() //=================== FRAME parameters ============================ AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); - if (geo == kHoles) { - FRAME->SetHoles(1); - } else { - FRAME->SetHoles(0); - } } if (iSHIL) @@ -334,14 +324,8 @@ void Config() // 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(); + // Switch on TR + AliTRDsim *TRDsim = TRD->CreateTR(); } if (iFMD) diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C index 22feeaff4e3..870329ef91d 100644 --- a/macros/ConfigBeautyPPR.C +++ b/macros/ConfigBeautyPPR.C @@ -333,10 +333,6 @@ void Config() // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2) TRD->SetGasMix(1); - // With hole in front of PHOS - TRD->SetPHOShole(); - // With hole in front of RICH - TRD->SetRICHhole(); // Switch on TR AliTRDsim *TRDsim = TRD->CreateTR(); } diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C index 116c25bb21f..88a2d4c429f 100644 --- a/macros/ConfigCharmPPR.C +++ b/macros/ConfigCharmPPR.C @@ -332,10 +332,6 @@ void Config() // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2) TRD->SetGasMix(1); - // With hole in front of PHOS - TRD->SetPHOShole(); - // With hole in front of RICH - TRD->SetRICHhole(); // Switch on TR AliTRDsim *TRDsim = TRD->CreateTR(); } diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C index 15d3c068d99..42a6f8c6c5a 100644 --- a/macros/ConfigHBT.C +++ b/macros/ConfigHBT.C @@ -411,10 +411,6 @@ void Config() // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2) TRD->SetGasMix(1); - // With hole in front of PHOS - TRD->SetPHOShole(); - // With hole in front of RICH - TRD->SetRICHhole(); // Switch on TR AliTRDsim *TRDsim = TRD->CreateTR(); } diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C index b08bc2715e6..5266dad98fc 100644 --- a/macros/ConfigPPR.C +++ b/macros/ConfigPPR.C @@ -100,11 +100,6 @@ const char* pprRunName[] = { "kFlow_2_2000", "kFlow_10_2000", "kFlow_6_2000", "kFlow_6_5000", "kHIJINGplus" }; -enum PprGeo_t -{ - kHoles, kNoHoles -}; - enum PprRad_t { kGluonRadiation, kNoGluonRadiation @@ -119,7 +114,6 @@ enum PprMag_t // This part for configuration //static PprRun_t srun = test50; static PprRun_t srun = kHIJINGplus; -static PprGeo_t sgeo = kNoHoles; static PprRad_t srad = kGluonRadiation; static PprMag_t smag = k5kG; static Int_t sseed = 12345; //Set 0 to use the current time @@ -260,14 +254,6 @@ void Config() comment = comment.Append(" | Gluon Radiation Off"); } - if (sgeo == kHoles) - { - comment = comment.Append(" | Holes for PHOS/RICH"); - - } else { - comment = comment.Append(" | No holes for PHOS/RICH"); - } - printf("\n \n Comment: %s \n \n", comment.Data()); @@ -338,11 +324,6 @@ void Config() //=================== FRAME parameters ============================ AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); - if (sgeo == kHoles) { - FRAME->SetHoles(1); - } else { - FRAME->SetHoles(0); - } } if (iSHIL) @@ -452,14 +433,8 @@ void Config() // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2) TRD->SetGasMix(1); - if (sgeo == kHoles) { - // With hole in front of PHOS - TRD->SetPHOShole(); - // With hole in front of RICH - TRD->SetRICHhole(); - } - // Switch on TR - AliTRDsim *TRDsim = TRD->CreateTR(); + // Switch on TR + AliTRDsim *TRDsim = TRD->CreateTR(); } if (iFMD) diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C index d981cbe2aec..0841e529b0b 100644 --- a/macros/Config_PDC06.C +++ b/macros/Config_PDC06.C @@ -391,7 +391,6 @@ void Config() //=================== FRAME parameters ============================ AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame"); - FRAME->SetHoles(0); } if (iSHIL) diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C index 4247b8e81e7..d28b5518639 100644 --- a/macros/Config_PythiaHeavyFlavours.C +++ b/macros/Config_PythiaHeavyFlavours.C @@ -468,10 +468,6 @@ void Config() // Select the gas mixture (0: 97% Xe + 3% isobutane, 1: 90% Xe + 10% CO2) TRD->SetGasMix(1); - // With hole in front of PHOS - TRD->SetPHOShole(); - // With hole in front of RICH - TRD->SetRICHhole(); // Switch on TR AliTRDsim *TRDsim = TRD->CreateTR(); } diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C index 462252fad90..e718067c5d0 100644 --- 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) { @@ -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) @@ -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(); } @@ -366,13 +350,6 @@ void ConfigCommon(Bool_t interactiveSetup) } } // end (!isSetInteractively) - else { - - if (geo == kHoles) - AliRunConfiguration::SwitchHoles(kTRUE); - else - AliRunConfiguration::SwitchHoles(kFALSE); - } cout << "End of g4ConfigCommon.C" << endl; } -- 2.43.0