X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=macros%2FConfig_PythiaHeavyFlavours.C;h=b6b25683a1856ed459ca866fff94779ed53aa292;hb=017e0494b18ec578a4b1bb362cd7f90c4fa0e312;hp=0cca098233df94ad567a770f92eeebda0820186b;hpb=ee621efaada2279f2b987cfa013dc67866751d4d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 0cca098233d..b6b25683a18 100644
--- 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,10 +32,10 @@
 #include "STRUCT/AliFRAMEv2.h"
 #include "STRUCT/AliSHILv3.h"
 #include "STRUCT/AliPIPEv3.h"
-#include "ITS/AliITSvPPRasymmFMD.h"
+#include "ITS/AliITSv11.h"
 #include "TPC/AliTPCv2.h"
 #include "TOF/AliTOFv6T0.h"
-#include "HMPID/AliHMPIDv2.h"
+#include "HMPID/AliHMPIDv3.h"
 #include "ZDC/AliZDCv3.h"
 #include "TRD/AliTRDv1.h"
 #include "FMD/AliFMDv0.h"
@@ -50,10 +50,12 @@
 enum ProcessHvFl_t 
 {
   kCharmPbPb5500,  kCharmpPb8800,  kCharmpp14000,  kCharmpp14000wmi,
+  kCharmSemiElpp14000wmi,
   kD0PbPb5500,     kD0pPb8800,     kD0pp14000,
   kDPlusPbPb5500,  kDPluspPb8800,  kDPluspp14000,
   kDPlusStrangePbPb5500, kDPlusStrangepPb8800, kDPlusStrangepp14000,
-  kBeautyPbPb5500, kBeautypPb8800, kBeautypp14000, kBeautypp14000wmi
+  kBeautyPbPb5500, kBeautypPb8800, kBeautypp14000, kBeautypp14000wmi,
+  kBeautySemiElpp14000wmi
 };
 //--- Decay Mode ---
 enum DecayHvFl_t 
@@ -65,11 +67,6 @@ enum YCut_t
 {
   kFull, kBarrel, kMuonArm
 };
-//--- Magnetic Field ---
-enum Mag_t
-{
-    k2kG, k4kG, k5kG
-};
 //--- Trigger config ---
 enum TrigConf_t
 {
@@ -78,23 +75,19 @@ enum TrigConf_t
 const char * TrigConfName[] = {
     "p-p","Pb-Pb"
 };
-enum PprGeo_t
-  {
-    kHoles, kNoHoles
-  };
 
 //--- Functions ---
+class AliGenPythia;
 AliGenPythia *PythiaHVQ(ProcessHvFl_t proc);
 void          LoadPythia();
 
 
 // This part for configuration
-static ProcessHvFl_t procHvFl = kCharmPbPb5500;
+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
-static PprGeo_t      geo      = kHoles;
 // nEvts = -1  : you get 1 QQbar pair and all the fragmentation and 
 //               decay chain
 // nEvts = N>0 : you get N charm / beauty Hadrons 
@@ -151,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);
   }
   
@@ -171,13 +164,13 @@ void Config()
       return;
     }
   rl->SetCompressionLevel(2);
-  rl->SetNumberOfEventsPerFile(3);
+  rl->SetNumberOfEventsPerFile(1000);
   gAlice->SetRunLoader(rl);
   // gAlice->SetGeometryFromFile("geometry.root");
   // gAlice->SetGeometryFromCDB();
 
   // Set the trigger configuration
-  gAlice->SetTriggerDescriptor(TrigConfName[trig]);
+  AliSimulation::Instance()->SetTriggerConfig(TrigConfName[trig]);
   cout<<"Trigger configuration is set to  "<<TrigConfName[trig]<<endl;
 
   //
@@ -303,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;
@@ -372,12 +363,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) {
@@ -397,7 +383,7 @@ void Config()
   if(iITS) {
     //=================== ITS parameters ============================
 
-    AliITSvPPRasymmFMD *ITS  = new AliITSvPPRasymmFMD("ITS","New ITS PPR detailed version with asymmetric services");
+    AliITS *ITS  = new AliITSv11("ITS","ITS v11");
   }
   
 
@@ -414,7 +400,7 @@ void Config()
 
   if(iHMPID) {
     //=================== HMPID parameters ===========================
-    AliHMPID *HMPID  = new AliHMPIDv2("HMPID","normal HMPID");    
+    AliHMPID *HMPID  = new AliHMPIDv3("HMPID","normal HMPID");    
 
   }
 
@@ -523,6 +509,18 @@ AliGenPythia *PythiaHVQ(ProcessHvFl_t proc) {
     gener->SetPtHard(ptHardMin,ptHardMax);
     gener->SetEnergyCMS(14000.);
     break;
+  case kCharmSemiElpp14000wmi:
+    comment = comment.Append(" Charm in pp at 14 TeV with mult. interactions");
+    gener = new AliGenPythia(-1);
+    gener->SetProcess(kPyCharmppMNRwmi);
+    gener->SetStrucFunc(kCTEQ5L);
+    gener->SetPtHard(ptHardMin,ptHardMax);
+    gener->SetEnergyCMS(14000.);
+    gener->SetCutOnChild(1);
+    gener->SetPdgCodeParticleforAcceptanceCut(11);
+    gener->SetChildYRange(-1,1);
+    gener->SetChildPtRange(1,10000.);
+    break;
   case kD0PbPb5500:
     comment = comment.Append(" D0 in Pb-Pb at 5.5 TeV");
     gener = new AliGenPythia(nEvts);
@@ -639,6 +637,18 @@ AliGenPythia *PythiaHVQ(ProcessHvFl_t proc) {
     gener->SetPtHard(ptHardMin,ptHardMax);
     gener->SetEnergyCMS(14000.);
     break;
+  case kBeautySemiElpp14000wmi:
+    comment = comment.Append(" Beauty in pp at 14 TeV with mult. interactions");
+    gener = new AliGenPythia(-1);
+    gener->SetProcess(kPyBeautyppMNRwmi);
+    gener->SetStrucFunc(kCTEQ5L);
+    gener->SetPtHard(ptHardMin,ptHardMax);
+    gener->SetEnergyCMS(14000.);
+    gener->SetCutOnChild(1);
+    gener->SetPdgCodeParticleforAcceptanceCut(11);
+    gener->SetChildYRange(-1,1);
+    gener->SetChildPtRange(1,10000.);
+    break;
   }
 
   return gener;