Removing obsolete TRD calls

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

diff --git a/macros/Config.C b/macros/Config.C
index 83fd7b172d3c08e10d17f09cc787145c4c506f3c..c2483a62a98c64ca3df0ed4b11e3bba4a789e593 100644 (file)
--- a/macros/Config.C
+++ b/macros/Config.C
@@ -9,7 +9,7 @@
 #include <TRandom.h>
 #include <TSystem.h>
 #include <TVirtualMC.h>
-#include <TGeant3.h>
+#include <TGeant3TGeo.h>
 #include "STEER/AliRunLoader.h"
 #include "STEER/AliRun.h"
 #include "STEER/AliConfig.h"
@@ -27,7 +27,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/AliZDCv2.h"
 #include "TRD/AliTRDv1.h"
@@ -36,18 +36,12 @@
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
-#include "EMCAL/AliEMCALv1.h"
+#include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv0.h"
-#include "VZERO/AliVZEROv2.h"
+#include "VZERO/AliVZEROv7.h"
 #endif
 
 Float_t EtaToTheta(Float_t arg);
-static Int_t    eventsPerRun = 100;
-enum PprGeo_t 
-{
-    kHoles, kNoHoles
-};
-static PprGeo_t geo = kHoles;
 
 void Config()
 {
@@ -56,7 +50,7 @@ void Config()
 
     // Set Random Number seed
   gRandom->SetSeed(123456); // Set 0 to use the currecnt time
-    cout<<"Seed for random number generation= "<<gRandom->GetSeed()<<endl; 
+  AliLog::Message(AliLog::kInfo, Form("Seed for random number generation = %d",gRandom->GetSeed()), "Config.C", "Config.C", "Config()","Config.C", __LINE__);
 
 
    // libraries required by geant321
@@ -64,13 +58,14 @@ void Config()
     gSystem->Load("libgeant321");
 #endif
 
-    new     TGeant3("C++ Interface to Geant3");
+    new     TGeant3TGeo("C++ Interface to Geant3");
 
     AliRunLoader* rl=0x0;
 
-    cout<<"Config.C: Creating Run Loader ..."<<endl;
+    AliLog::Message(AliLog::kInfo, "Creating Run Loader", "Config.C", "Config.C", "Config()"," Config.C", __LINE__);
+
     rl = AliRunLoader::Open("galice.root",
-                           AliConfig::fgkDefaultEventFolderName,
+                           AliConfig::GetDefaultEventFolderName(),
                            "recreate");
     if (rl == 0x0)
       {
@@ -81,6 +76,10 @@ void Config()
     rl->SetNumberOfEventsPerFile(3);
     gAlice->SetRunLoader(rl);
 
+    // Set the trigger configuration
+    gAlice->SetTriggerDescriptor("Pb-Pb");
+    cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
+
     //
     // Set External decayer
     TVirtualMCDecayer *decayer = new AliDecayerPythia();
@@ -221,11 +220,6 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-       if (geo == kHoles) {
-           FRAME->SetHoles(1);
-       } else {
-           FRAME->SetHoles(0);
-       }
     }
 
     if (iSHIL)
@@ -300,35 +294,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->SetSecAU(-1);
-        TPC->SetSecAL(-1);
     }
 
 
     if (iTOF) {
         //=================== TOF parameters ============================
-       AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
+       AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF");
     }
 
 
@@ -352,17 +325,6 @@ void Config()
         //=================== TRD parameters ============================
 
         AliTRD *TRD = new AliTRDv1("TRD", "TRD slow simulator");
-
-        // 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();
     }
 
     if (iFMD)
@@ -374,7 +336,7 @@ void Config()
     if (iMUON)
     {
         //=================== MUON parameters ===========================
-
+        // New MUONv1 version (geometry defined via builders)
         AliMUON *MUON = new AliMUONv1("MUON", "default");
     }
     //=================== PHOS parameters ===========================
@@ -400,7 +362,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv1("EMCAL", "G56_2_55_19_104_14");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
     }
 
      if (iCRT)
@@ -412,10 +374,10 @@ void Config()
      if (iVZERO)
     {
         //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv2("VZERO", "normal VZERO");
+        AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }
 
-     cout << "End of Config.C" << endl;
+     AliLog::Message(AliLog::kInfo, "End of Config", "Config.C", "Config.C", "Config()"," Config.C", __LINE__);
 
 }