AliTOFv4T0 replaced by AliTOFv5T0

[u/mrichter/AliRoot.git] / macros / ConfigHBT.C

diff --git a/macros/ConfigHBT.C b/macros/ConfigHBT.C
index ca4af645a94a813cd268f4eb99ef7eb6e11932e0..15d3c068d9983538caae439b3e10e9220dbfc205 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/AliTOFv4T0.h"
+#include "TOF/AliTOFv5T0.h"
 #include "RICH/AliRICHv1.h"
 #include "ZDC/AliZDCv1.h"
 #include "TRD/AliTRDv1.h"
@@ -38,9 +38,8 @@
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
-#include "EMCAL/AliEMCALv1.h"
+#include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv1.h"
-#include "VZERO/AliVZEROv2.h"
 #endif
 
 void Config()
@@ -53,10 +52,10 @@ void Config()
     gSystem->Load("libgeant321");
 #endif
 
-    new     TGeant3("C++ Interface to Geant3");
+    new     TGeant3TGeo("C++ Interface to Geant3");
 
     cout<<"Config.C: Creating Run Loader ..."<<endl;
-    AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::fgkDefaultEventFolderName,
+    AliRunLoader* rl = AliRunLoader::Open("galice.root",AliConfig::GetDefaultEventFolderName(),
                                               "recreate");
     if (rl == 0x0)
       {
@@ -371,36 +370,14 @@ void Config()
 
     if (iTPC)
     {
-        //============================ TPC parameters ================================
-        // --- This allows the user to specify sectors for the SLOW (TPC geometry 2)
-        // --- Simulator. SecAL (SecAU) <0 means that ALL lower (upper)
-        // --- sectors are specified, any value other than that requires at least one 
-        // --- sector (lower or upper)to be specified!
-        // --- Reminder: sectors 1-24 are lower sectors (1-12 -> z>0, 13-24 -> z<0)
-        // ---           sectors 25-72 are the upper ones (25-48 -> z>0, 49-72 -> z<0)
-        // --- SecLows - number of lower sectors specified (up to 6)
-        // --- SecUps - number of upper sectors specified (up to 12)
-        // --- Sens - sensitive strips for the Slow Simulator !!!
-        // --- This does NOT work if all S or L-sectors are specified, i.e.
-        // --- if SecAL or SecAU < 0
-        //
-        //
-        //-----------------------------------------------------------------------------
-
-        //  gROOT->LoadMacro("SetTPCParam.C");
-        //  AliTPCParam *param = SetTPCParam();
+        //============================ TPC parameters ===================
         AliTPC *TPC = new AliTPCv2("TPC", "Default");
-
-        // All sectors included 
-        TPC->SetSecAL(-1);
-        TPC->SetSecAU(-1);
-
     }
 
     if (iTOF)
     {
         //=================== TOF parameters ============================
-        AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
+        AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF");
     }
 
     if (iRICH)
@@ -478,7 +455,7 @@ void Config()
     if (iEMCAL && !iRICH)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "EMCALArch1a");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
     }
 
     if (iSTART)