Removed printf and fabs

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

diff --git a/macros/Config_PDC06.C b/macros/Config_PDC06.C
index 06f50e26b586de6ccf58047d1a1c9b9dd27e3669..35493852e31cd3709d6c80f62c73033d22977f43 100644 (file)
--- a/macros/Config_PDC06.C
+++ b/macros/Config_PDC06.C
@@ -33,11 +33,11 @@
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
 #include "ITS/AliITSgeom.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11Hybrid.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
-#include "ZDC/AliZDCv2.h"
+#include "HMPID/AliHMPIDv3.h"
+#include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv1.h"
 #include "MUON/AliMUONv1.h"
@@ -45,7 +45,7 @@
 #include "PMD/AliPMDv1.h"
 #include "T0/AliT0v1.h"
 #include "EMCAL/AliEMCALv2.h"
-#include "ACORDE/AliACORDEv0.h"
+#include "ACORDE/AliACORDEv1.h"
 #include "VZERO/AliVZEROv7.h"
 #endif
 
@@ -96,16 +96,13 @@ const char * TrigConfName[] = {
     "p-p","Pb-Pb"
 };
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-
 //--- Functions ---
+class AliGenPythia;
 AliGenPythia *PythiaHVQ(PDC06Proc_t proc);
 AliGenerator *MbCocktail();
 AliGenerator *PyMbTriggered(Int_t pdg);
 void ProcessEnvironmentVars();
+void LoadPythia();
 
 // This part for configuration
 static PDC06Proc_t   proc     = kPyMbNoHvq;
@@ -113,7 +110,6 @@ static DecayHvFl_t   decHvFl  = kNature;
 static YCut_t        ycut     = kFull;
 static Mag_t         mag      = k5kG; 
 static TrigConf_t    trig     = kDefaultPPTrig; // default pp trigger configuration
-static PprGeo_t geo = kHoles;
 //========================//
 // Set Random Number seed //
 //========================//
@@ -153,10 +149,13 @@ static TString comment;
 
 void Config()
 {
- 
+    
 
   // Get settings from environment variables
   ProcessEnvironmentVars();
+  // Load pythia libraries
+  LoadPythia();
+  //
 
   gRandom->SetSeed(seed);
   cerr<<"Seed for random number generation= "<<seed<<endl; 
@@ -420,11 +419,7 @@ void Config()
         //=================== FRAME parameters ============================
 
         AliFRAMEv2 *FRAME = new AliFRAMEv2("FRAME", "Space Frame");
-        if (geo == kHoles) {
-         FRAME->SetHoles(1);
-       } else {
-         FRAME->SetHoles(0);
-       }
+       FRAME->SetHoles(1);
     }
 
     if (iSHIL)
@@ -446,7 +441,7 @@ void Config()
     {
         //=================== ITS parameters ============================
 
-       AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+       AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
     }
 
     if (iTPC)
@@ -459,19 +454,13 @@ void Config()
     if (iTOF) {
         //=================== TOF parameters ============================
        AliTOF *TOF = new AliTOFv6T0("TOF", "normal TOF");
-       // Partial geometry:
-       // starting at 3h in anticlock-wise direction
-       // looking from A side (ALICE numbering convention),
-       // modules at 1,2,6,7,9,10,11,12,15,16,17
-               //Int_t TOFSectors[18]={0,0,0,-1,-1,-1,0,0,0,0,0,0,-1,-1,-1,0,0,0};
-       //TOF->SetTOFSectors(TOFSectors);
     }
 
 
     if (iHMPID)
     {
         //=================== HMPID parameters ===========================
-        AliHMPID *HMPID = new AliHMPIDv2("HMPID", "normal HMPID");
+        AliHMPID *HMPID = new AliHMPIDv3("HMPID", "normal HMPID");
 
     }
 
@@ -480,7 +469,7 @@ void Config()
     {
         //=================== ZDC parameters ============================
 
-        AliZDC *ZDC = new AliZDCv2("ZDC", "normal ZDC");
+        AliZDC *ZDC = new AliZDCv3("ZDC", "normal ZDC");
     }
 
     if (iTRD)
@@ -538,13 +527,13 @@ void Config()
     if (iEMCAL)
     {
         //=================== EMCAL parameters ============================
-        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "SHISH_77_TRD1_2X2_FINAL_110DEG");
+        AliEMCAL *EMCAL = new AliEMCALv2("EMCAL", "EMCAL_COMPLETE");
     }
 
      if (iACORDE)
     {
         //=================== ACORDE parameters ============================
-        AliACORDE *ACORDE = new AliACORDEv0("ACORDE", "normal ACORDE");
+        AliACORDE *ACORDE = new AliACORDEv1("ACORDE", "normal ACORDE");
     }
 
      if (iVZERO)
@@ -769,3 +758,11 @@ void ProcessEnvironmentVars()
 
 
 
+void LoadPythia()
+{
+    // Load Pythia related libraries
+    gSystem->Load("liblhapdf.so");      // Parton density functions
+    gSystem->Load("libEGPythia6.so");   // TGenerator interface
+    gSystem->Load("libpythia6.so");     // Pythia
+    gSystem->Load("libAliPythia6.so");  // ALICE specific implementations
+}