Removing obsolete TRD calls

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

diff --git a/macros/ConfigPPR.C b/macros/ConfigPPR.C
index b61437982590b59d88739a12fed5cade04992da5..66d808e0e9f9fafd5f2c05a36fc627d56c04e4e0 100644 (file)
--- a/macros/ConfigPPR.C
+++ b/macros/ConfigPPR.C
@@ -42,7 +42,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"
@@ -53,7 +53,7 @@
 #include "START/AliSTARTv1.h"
 #include "EMCAL/AliEMCALv2.h"
 #include "CRT/AliCRTv0.h"
-#include "VZERO/AliVZEROv5.h"
+#include "VZERO/AliVZEROv7.h"
 #endif
 
 enum PprRun_t 
@@ -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
@@ -115,14 +110,23 @@ enum PprMag_t
     k2kG, k4kG, k5kG
 };
 
+enum PprTrigConf_t
+{
+    kDefaultPPTrig, kDefaultPbPbTrig
+};
+
+const char * pprTrigConfName[] = {
+    "p-p","Pb-Pb"
+};
 
 // 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
+//static PprTrigConf_t strig = kDefaultPPTrig; // default pp trigger configuration
+static PprTrigConf_t strig = kDefaultPbPbTrig; // default PbPb trigger configuration
 
 // Comment line 
 static TString  comment;
@@ -170,6 +174,10 @@ void Config()
     rl->SetNumberOfEventsPerFile(3);
     gAlice->SetRunLoader(rl);
 
+    // Set the trigger configuration
+    gAlice->SetTriggerDescriptor(pprTrigConfName[strig]);
+    cout<<"Trigger configuration is set to  "<<pprTrigConfName[strig]<<endl;
+
     //
     // Set External decayer
     AliDecayer *decayer = new AliDecayerPythia();
@@ -260,14 +268,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 +338,6 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-       if (sgeo == kHoles) {
-           FRAME->SetHoles(1);
-       } else {
-           FRAME->SetHoles(0);
-       }
     }
 
     if (iSHIL)
@@ -425,7 +420,7 @@ void Config()
 
     if (iTOF) {
         //=================== TOF parameters ============================
-       AliTOF *TOF = new AliTOFv4T0("TOF", "normal TOF");
+       AliTOF *TOF = new AliTOFv5T0("TOF", "normal TOF");
     }
 
 
@@ -449,17 +444,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 (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();
     }
 
     if (iFMD)
@@ -497,7 +481,7 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
     }
 
      if (iCRT)
@@ -509,7 +493,7 @@ void Config()
      if (iVZERO)
     {
         //=================== CRT parameters ============================
-        AliVZERO *VZERO = new AliVZEROv5("VZERO", "normal VZERO");
+        AliVZERO *VZERO = new AliVZEROv7("VZERO", "normal VZERO");
     }
  
              
@@ -1264,7 +1248,7 @@ AliGenerator* GeneratorFactory(PprRun_t srun) {
        gener->SetMuonPtCut(0.8);
        gener->SetMuonThetaCut(171.,178.);
        gener->SetMuonMultiplicity(2);
-       gener->SetImpactParameterRange(12.,16.);  //Centrality class Cent1 for PDC04
+       gener->SetImpactParameterRange(0.,5.);  //Centrality class Cent1 for PDC04
        gGener=gener;
       }
       break;