removing commented lines and header from tchain

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

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index d28b551863934aa62c1544b44edca642ac808d0f..9e74b0e619148db09a3bb043a5643f637e34afe5 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -17,7 +17,7 @@
 #include <TDatime.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"
@@ -70,6 +70,14 @@ enum Mag_t
 {
     k2kG, k4kG, k5kG
 };
+//--- Trigger config ---
+enum TrigConf_t
+{
+    kDefaultPPTrig, kDefaultPbPbTrig
+};
+const char * TrigConfName[] = {
+    "p-p","Pb-Pb"
+};
 //--- Functions ---
 AliGenPythia *PythiaHVQ(ProcessHvFl_t proc);
 
@@ -79,6 +87,7 @@ static ProcessHvFl_t procHvFl = kCharmPbPb5500;
 static DecayHvFl_t   decHvFl  = kNature; 
 static YCut_t        ycut     = kFull;
 static Mag_t         mag      = k5kG; 
+static TrigConf_t    trig     = kDefaultPbPbTrig; // default PbPb trigger configuration
 // nEvts = -1  : you get 1 QQbar pair and all the fragmentation and 
 //               decay chain
 // nEvts = N>0 : you get N charm / beauty Hadrons 
@@ -152,6 +161,10 @@ void Config()
   rl->SetNumberOfEventsPerFile(3);
   gAlice->SetRunLoader(rl);
 
+  // Set the trigger configuration
+  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
+
   //
   //=======================================================================
   // ************* STEERING parameters FOR ALICE SIMULATION **************
@@ -387,23 +400,11 @@ void Config()
     ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRasymm2.det");  // don't touch this parameter if you're not an ITS developer
     ITS->SetThicknessDet1(200.);   // detector thickness on layer 1 must be in the range [150,300]
     ITS->SetThicknessDet2(200.);   // detector thickness on layer 2 must be in the range [150,300]
-    ITS->SetThicknessChip1(200.);  // chip thickness on layer 1 must be in the range [100,300]
-    ITS->SetThicknessChip2(200.);  // chip thickness on layer 2 must be in the range [100,300]
+    ITS->SetThicknessChip1(150.);  // chip thickness on layer 1 must be in the range [100,300]
+    ITS->SetThicknessChip2(150.);  // chip thickness on layer 2 must be in the range [100,300]
     ITS->SetRails(1);             // 1 --> rails in ; 0 --> rails out
     ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
     //
-    //AliITSvPPRsymm *ITS  = new AliITSvPPRsymm("ITS","New ITS PPR detailed version with symmetric services");
-    //ITS->SetMinorVersion(2);                                       // don't touch this parameter if you're not an ITS developer
-    //ITS->SetReadDet(kFALSE);                                       // don't touch this parameter if you're not an ITS developer
-    //ITS->SetWriteDet("$ALICE_ROOT/ITS/ITSgeometry_vPPRsymm2.det"); // don't touch this parameter if you're not an ITS developer
-    //ITS->SetThicknessDet1(300.);   // detector thickness on layer 1 must be in the range [150,300]
-    //ITS->SetThicknessDet2(300.);   // detector thickness on layer 2 must be in the range [150,300]
-    //ITS->SetThicknessChip1(300.);  // chip thickness on layer 1 must be in the range [100,300]
-    //ITS->SetThicknessChip2(300.);  // chip thickness on layer 2 must be in the range [100,300]
-    //ITS->SetRails(1);              // 1 --> rails in ; 0 --> rails out
-    //ITS->SetCoolingFluid(1);       // 1 --> water ; 0 --> freon
-    //
-    //
     // Coarse geometries (warning: no hits are produced with these coarse geometries and they unuseful 
     // for reconstruction !):
     //                                                     
@@ -464,12 +465,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);
-  
-    // Switch on TR
-    AliTRDsim *TRDsim = TRD->CreateTR();
   }
 
   if(iFMD) {