PAR: includes from previously enabled PARfiles

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

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index a4afabc22fc9d33a091b69db270527868a8cff56..c05412e87db546475e6ce0a69ce80d87d99aa09f 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -23,7 +23,7 @@
 #include "STEER/AliConfig.h"
 #include "PYTHIA6/AliDecayerPythia.h"
 #include "PYTHIA6/AliGenPythia.h"
-#include "STEER/AliMagFMaps.h"
+#include "STEER/AliMagF.h"
 #include "STRUCT/AliBODY.h"
 #include "STRUCT/AliMAG.h"
 #include "STRUCT/AliABSOv3.h"
@@ -32,7 +32,7 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSv11Hybrid.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
 #include "HMPID/AliHMPIDv3.h"
@@ -67,11 +67,6 @@ enum YCut_t
 {
   kFull, kBarrel, kMuonArm
 };
-//--- Magnetic Field ---
-enum Mag_t
-{
-    k2kG, k4kG, k5kG
-};
 //--- Trigger config ---
 enum TrigConf_t
 {
@@ -91,7 +86,7 @@ void          LoadPythia();
 static ProcessHvFl_t procHvFl = kCharmpp14000wmi;
 static DecayHvFl_t   decHvFl  = kNature; 
 static YCut_t        ycut     = kFull;
-static Mag_t         mag      = k5kG; 
+static AliMagF::BMap_t mag    = AliMagF::k5kG; 
 static TrigConf_t    trig     = kDefaultPbPbTrig; // default PbPb trigger configuration
 // nEvts = -1  : you get 1 QQbar pair and all the fragmentation and 
 //               decay chain
@@ -149,7 +144,7 @@ void Config()
   new TGeant3TGeo("C++ Interface to Geant3");
 
   if(!AliCDBManager::Instance()->IsDefaultStorageSet()){
-    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT");
+    AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
     AliCDBManager::Instance()->SetRun(0);
   }
   
@@ -175,7 +170,7 @@ void Config()
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //
@@ -301,20 +296,18 @@ void Config()
 
   // FIELD
   //    
-  if (mag == k2kG) {
+  if (mag == AliMagF::k2kG) {
     comment = comment.Append(" | L3 field 0.2 T");
-  } else if (mag == k4kG) {
-    comment = comment.Append(" | L3 field 0.4 T");
-  } else if (mag == k5kG) {
+  } else if (mag == AliMagF::k5kG) {
     comment = comment.Append(" | L3 field 0.5 T");
   }
   printf("\n \n Comment: %s \n \n", comment.Data());
     
-  AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag);
+  AliMagF* field = new AliMagF("Maps","Maps",  1., 1.,  mag);
   field->SetL3ConstField(0); //Using const. field in the barrel
-  rl->CdGAFile();
-  gAlice->SetField(field);    
+  TGeoGlobalMagField::Instance()->SetField(field);
 
+  rl->CdGAFile();
 
   // By default all ALICE is switched off
   Int_t iABSO=0;
@@ -390,7 +383,7 @@ void Config()
   if(iITS) {
     //=================== ITS parameters ============================
 
-    AliITS *ITS  = new AliITSv11Hybrid("ITS","ITS v11Hybrid");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 
@@ -666,10 +659,10 @@ AliGenPythia *PythiaHVQ(ProcessHvFl_t proc) {
 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
+    gSystem->Load("liblhapdf");      // Parton density functions
+    gSystem->Load("libEGPythia6");   // TGenerator interface
+    gSystem->Load("libpythia6");     // Pythia
+    gSystem->Load("libAliPythia6");  // ALICE specific implementations
 }