added TOFheader writing in AOD

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

diff --git a/macros/ConfigBeautyPPR.C b/macros/ConfigBeautyPPR.C
index 021cedaec790bc5289cd9396a05e681336bb7ccf..a765a8b2d29db7278981703fdedf5a87582eaab8 100644 (file)
--- a/macros/ConfigBeautyPPR.C
+++ b/macros/ConfigBeautyPPR.C
@@ -19,11 +19,11 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymm.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
-#include "ZDC/AliZDCv1.h"
+#include "HMPID/AliHMPIDv3.h"
+#include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
 #include "MUON/AliMUONv1.h"
@@ -33,11 +33,7 @@
 #include "ACORDE/AliACORDEv1.h"
 #endif
 
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
-static PprGeo_t geo = kHoles;
+void LoadPythia();
 
 void Config()
 {
@@ -52,7 +48,8 @@ void Config()
   //  gRandom->SetSeed(seed);
   gRandom->SetSeed(12345);
   cerr<<"Seed for random number generation= "<<seed<<endl; 
-
+  // Load Pythia libraries
+  LoadPythia();
   // libraries required by geant321
 #if defined(__CINT__)
   gSystem->Load("libgeant321");
@@ -64,7 +61,7 @@ void Config()
   //  Create the output file
    
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
   
@@ -86,7 +83,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor("Pb-Pb");
+  AliSimulation::Instance()->SetTriggerConfig("Pb-Pb");
   cout<<"Trigger configuration is set to  Pb-Pb"<<endl;
 
   //
@@ -226,12 +223,7 @@ void Config()
     //=================== FRAME parameters ============================
 
     AliFRAME *FRAME  = new AliFRAMEv2("FRAME","Space Frame");
-    if (geo == kHoles) {
-      FRAME->SetHoles(1);
-    } else {
-      FRAME->SetHoles(0);
-    }
-
+    FRAME->SetHoles(1);
   }
 
   if(iSHIL) {
@@ -251,7 +243,7 @@ void Config()
   if(iITS) {
     //=================== ITS parameters ============================
 
-    AliITSvPPRasymm *ITS  = new AliITSvPPRasymm("ITS","New ITS PPR detailed version with asymmetric services");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 
@@ -268,7 +260,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv3("HMPID","normal HMPID");    
 
   }
 
@@ -276,7 +268,7 @@ void Config()
   if(iZDC) {
     //=================== ZDC parameters ============================
 
-    AliZDC *ZDC  = new AliZDCv1("ZDC","normal ZDC");
+    AliZDC *ZDC  = new AliZDCv3("ZDC","normal ZDC");
   }
 
   if(iACORDE) {
@@ -327,3 +319,13 @@ void Config()
 
          
 }
+
+
+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
+}