Possibility to use loadlibs.C on Solaris x86

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

diff --git a/macros/ConfigCharmPPR.C b/macros/ConfigCharmPPR.C
index 57165bd4e9e196390f66691dcf22d54186584d16..1dec8a399b7d21ad58d740cdcf6bbfaa4b20f284 100644 (file)
--- a/macros/ConfigCharmPPR.C
+++ b/macros/ConfigCharmPPR.C
@@ -21,16 +21,12 @@
 #include "STRUCT/AliPIPEv0.h"
 #include "ITS/AliITSvPPRasymm.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"
 #include "FMD/AliFMDv0.h"
 #include "MUON/AliMUONv1.h"
-#include "MUON/AliMUONSt1GeometryBuilder.h"
-#include "MUON/AliMUONSt2GeometryBuilder.h"
-#include "MUON/AliMUONSlatGeometryBuilder.h"
-#include "MUON/AliMUONTriggerGeometryBuilder.h"
 #include "PHOS/AliPHOSv1.h"
 #include "PMD/AliPMDv1.h"
 #include "START/AliSTARTv1.h"
@@ -76,7 +72,11 @@ 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
   AliDecayer* decayer = new AliDecayerPythia();
   decayer->SetForceDecay(kAll);
@@ -255,23 +255,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 !):
     //                                                     
@@ -306,7 +294,7 @@ void Config()
 
   if(iTOF) {
     //=================== TOF parameters ============================
-    AliTOF *TOF  = new AliTOFv4T0("TOF","normal TOF");
+    AliTOF *TOF  = new AliTOFv5T0("TOF","normal TOF");
   }
 
   if(iRICH) {
@@ -332,16 +320,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);
-  
-    // 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) {
@@ -353,10 +331,6 @@ void Config()
   if(iMUON) {
     //=================== MUON parameters ===========================
     AliMUON *MUON  = new AliMUONv1("MUON","default");
-    MUON->AddGeometryBuilder(new AliMUONSt1GeometryBuilder(MUON));
-    MUON->AddGeometryBuilder(new AliMUONSt2GeometryBuilder(MUON));
-    MUON->AddGeometryBuilder(new AliMUONSlatGeometryBuilder(MUON));
-    MUON->AddGeometryBuilder(new AliMUONTriggerGeometryBuilder(MUON));
   }
  
   //=================== PHOS parameters ===========================