From 2253ef47ceb4e2485769a1a90341cc830c0f2720 Mon Sep 17 00:00:00 2001 From: hristov Date: Sat, 3 Jan 2004 15:23:04 +0000 Subject: [PATCH] Setting TOF geometry to AliTOFv4T0 --- macros/Config.C | 7 +------ macros/ConfigBeautyPPR.C | 4 ++-- macros/ConfigCharmPPR.C | 4 ++-- macros/ConfigHBT.C | 4 ++-- macros/ConfigPPR.C | 7 +------ macros/Config_PythiaHeavyFlavours.C | 4 ++-- macros/g4ConfigCommon.C | 6 +----- 7 files changed, 11 insertions(+), 25 deletions(-) diff --git a/macros/Config.C b/macros/Config.C index de028b173dc..83fd7b172d3 100644 --- a/macros/Config.C +++ b/macros/Config.C @@ -27,7 +27,6 @@ #include "STRUCT/AliPIPEv0.h" #include "ITS/AliITSvPPRasymmFMD.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2FHoles.h" #include "TOF/AliTOFv4T0.h" #include "RICH/AliRICHv1.h" #include "ZDC/AliZDCv2.h" @@ -328,12 +327,8 @@ void Config() if (iTOF) { - if (geo == kHoles) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2FHoles("TOF", "TOF with Holes"); - } else { - AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); - } + AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); } diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C index 16b2a24649d..4ee66992866 100644 --- a/macros/ConfigBeautyPPR.C +++ b/macros/ConfigBeautyPPR.C @@ -21,7 +21,7 @@ #include "STRUCT/AliPIPEv0.h" #include "ITS/AliITSvPPRasymm.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2.h" +#include "TOF/AliTOFv4T0.h" #include "RICH/AliRICHv1.h" #include "ZDC/AliZDCv1.h" #include "TRD/AliTRDv1.h" @@ -324,7 +324,7 @@ void Config() if(iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2("TOF","normal TOF"); + AliTOF *TOF = new AliTOFv4T0("TOF","normal TOF"); } if(iRICH) { diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C index b4afe733ad8..f73aa8e6585 100644 --- a/macros/ConfigCharmPPR.C +++ b/macros/ConfigCharmPPR.C @@ -21,7 +21,7 @@ #include "STRUCT/AliPIPEv0.h" #include "ITS/AliITSvPPRasymm.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2.h" +#include "TOF/AliTOFv4T0.h" #include "RICH/AliRICHv1.h" #include "ZDC/AliZDCv1.h" #include "TRD/AliTRDv1.h" @@ -323,7 +323,7 @@ void Config() if(iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2("TOF","normal TOF"); + AliTOF *TOF = new AliTOFv4T0("TOF","normal TOF"); } if(iRICH) { diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C index d7b3e74c95a..ca4af645a94 100644 --- a/macros/ConfigHBT.C +++ b/macros/ConfigHBT.C @@ -29,7 +29,7 @@ #include "STRUCT/AliPIPEv0.h" #include "ITS/AliITSvPPRasymmFMD.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2.h" +#include "TOF/AliTOFv4T0.h" #include "RICH/AliRICHv1.h" #include "ZDC/AliZDCv1.h" #include "TRD/AliTRDv1.h" @@ -400,7 +400,7 @@ void Config() if (iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2("TOF", "normal TOF"); + AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); } if (iRICH) diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C index e061473a0be..8a7e625ca23 100644 --- a/macros/ConfigPPR.C +++ b/macros/ConfigPPR.C @@ -26,7 +26,6 @@ #include "STRUCT/AliPIPEv0.h" #include "ITS/AliITSvPPRasymmFMD.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2FHoles.h" #include "TOF/AliTOFv4T0.h" #include "RICH/AliRICHv1.h" #include "ZDC/AliZDCv2.h" @@ -375,12 +374,8 @@ void Config() if (iTOF) { - if (sgeo == kHoles) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2FHoles("TOF", "TOF with Holes"); - } else { - AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); - } + AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); } diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C index 8e1d4dc5155..95656268f08 100644 --- a/macros/Config_PythiaHeavyFlavours.C +++ b/macros/Config_PythiaHeavyFlavours.C @@ -34,7 +34,7 @@ #include "STRUCT/AliPIPEv0.h" #include "ITS/AliITSvPPRasymm.h" #include "TPC/AliTPCv2.h" -#include "TOF/AliTOFv2.h" +#include "TOF/AliTOFv4T0.h" #include "RICH/AliRICHv1.h" #include "ZDC/AliZDCv1.h" #include "TRD/AliTRDv1.h" @@ -436,7 +436,7 @@ void Config() if(iTOF) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2("TOF","normal TOF"); + AliTOF *TOF = new AliTOFv4T0("TOF","normal TOF"); } if(iRICH) { diff --git a/macros/g4ConfigCommon.C b/macros/g4ConfigCommon.C index a93e045e0c1..2a5ccc051f5 100644 --- a/macros/g4ConfigCommon.C +++ b/macros/g4ConfigCommon.C @@ -300,12 +300,8 @@ void ConfigCommon(Bool_t interactiveSetup) if (iTOF) { - if (geo == kHoles) { //=================== TOF parameters ============================ - AliTOF *TOF = new AliTOFv2FHoles("TOF", "TOF with Holes"); - } else { - AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); - } + AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF"); } if (iRICH) -- 2.39.3