Setting TOF geometry to AliTOFv4T0

diff --git a/macros/Config.C b/macros/Config.C
index de028b173dc960bfb79e36b5031dc9a5859c748b..83fd7b172d3c08e10d17f09cc787145c4c506f3c 100644 (file)
--- 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 16b2a24649dbdb428086cde8d69d585065831227..4ee66992866366de0349a0f5d005854fefa0aaa7 100644 (file)
--- 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 b4afe733ad8246b7f7cfa713b1d8707962f0ea70..f73aa8e65859c9806455403045fef9a0cc35243c 100644 (file)
--- 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 d7b3e74c95add12ea4450d9da3ed9323577e8702..ca4af645a94a813cd268f4eb99ef7eb6e11932e0 100644 (file)
--- 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 e061473a0be7942017de613fa3e48e450f242a61..8a7e625ca23ee634b6213e2e5f216c43abcd80f0 100644 (file)
--- 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 8e1d4dc51557fa176a7f8b15ea4709db0aba019c..95656268f0886a8eda93a134b3733244979b8479 100644 (file)
--- 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 a93e045e0c13a1db493eecdc9b64a78a839a9d5f..2a5ccc051f5702073080b895df9f219edc780f69 100644 (file)
--- 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)