AliTOFv4T0 replaced by AliTOFv5T0

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

diff --git a/macros/Config_PythiaHeavyFlavours.C b/macros/Config_PythiaHeavyFlavours.C
index 8170e68bb93a63ae73cc3641bee11d2f8b84dc89..95dad82d56f8087395a5a93137a1723c8ac8ee67 100644 (file)
--- a/macros/Config_PythiaHeavyFlavours.C
+++ b/macros/Config_PythiaHeavyFlavours.C
@@ -6,10 +6,9 @@
 // Mangano, Nason and Ridolfi.                                       //
 //                                                                   //
 // For details and for the NORMALIZATION of the yields see:          //
-// - "Charm and beauty production at the LHC", ALICE note submitted  //
-//   and available at: http://www.pd.infn.it/alipd/Docs.html         //
-// - Current version of the ALICE PPR (Chapter 6.5)                  //
-//   at: http://alice.web.cern.ch/Alice/ppr/web/CurrentVersion.html  //
+//   N.Carrer and A.Dainese,                                         //
+//   "Charm and beauty production at the LHC",                       //
+//   ALICE-INT-2003-019, [arXiv:hep-ph/0311225].                     //
 //*******************************************************************//
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <Riostream.h>
@@ -34,7 +33,7 @@
 #include "STRUCT/AliPIPEv0.h"
 #include "ITS/AliITSvPPRasymmFMD.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"
@@ -51,6 +50,7 @@ enum ProcessHvFl_t
 {
   kCharmPbPb5500,  kCharmpPb8800,  kCharmpp14000,
   kD0PbPb5500,     kD0pPb8800,     kD0pp14000,
+  kDPlusPbPb5500,     kDPluspPb8800,     kDPluspp14000,
   kBeautyPbPb5500, kBeautypPb8800, kBeautypp14000
 };
 //--- Decay Mode ---
@@ -101,15 +101,16 @@ void Config()
   UInt_t seed=curtime-procid;
 
   //  gRandom->SetSeed(seed);
+  //  cerr<<"Seed for random number generation= "<<seed<<endl; 
   gRandom->SetSeed(12345);
-  cerr<<"Seed for random number generation= "<<seed<<endl; 
+  
 
   // libraries required by geant321
 #if defined(__CINT__)
   gSystem->Load("libgeant321");
 #endif
 
-  new TGeant3("C++ Interface to Geant3");
+  new TGeant3TGeo("C++ Interface to Geant3");
 
   //=======================================================================
   //  Create the output file
@@ -246,7 +247,7 @@ void Config()
 
   pythia->SetTrackingFlag(0);
   // Specify GEANT tracking limits (Rmax, Zmax)
-  //gAlice->TrackingLimits(90.,1.0e10);
+  //gAlice->GetMCApp()->TrackingLimits(90.,1.0e10);
 
 
   pythia->Init();
@@ -263,6 +264,7 @@ void Config()
   printf("\n \n Comment: %s \n \n", comment.Data());
     
   AliMagFMaps* field = new AliMagFMaps("Maps","Maps", 2, 1., 10., mag);
+  field->SetL3ConstField(0); //Using const. field in the barrel
   rl->CdGAFile();
   gAlice->SetField(field);    
 
@@ -408,35 +410,14 @@ void Config()
   
 
   if(iTPC) {
-    //============================ TPC parameters ================================
-    // --- This allows the user to specify sectors for the SLOW (TPC geometry 2)
-    // --- Simulator. SecAL (SecAU) <0 means that ALL lower (upper)
-    // --- sectors are specified, any value other than that requires at least one 
-    // --- sector (lower or upper)to be specified!
-    // --- Reminder: sectors 1-24 are lower sectors (1-12 -> z>0, 13-24 -> z<0)
-    // ---           sectors 25-72 are the upper ones (25-48 -> z>0, 49-72 -> z<0)
-    // --- SecLows - number of lower sectors specified (up to 6)
-    // --- SecUps - number of upper sectors specified (up to 12)
-    // --- Sens - sensitive strips for the Slow Simulator !!!
-    // --- This does NOT work if all S or L-sectors are specified, i.e.
-    // --- if SecAL or SecAU < 0
-    //
-    //
-    //-----------------------------------------------------------------------------
-
-    //  gROOT->LoadMacro("SetTPCParam.C");
-    //  AliTPCParam *param = SetTPCParam();
+    //============================ TPC parameters ===================
     AliTPC *TPC  = new AliTPCv2("TPC","Default");
-    // All sectors included 
-    TPC->SetSecAL(-1);
-    TPC->SetSecAU(-1);
-
   }
 
 
   if(iTOF) {
     //=================== TOF parameters ============================
-    AliTOF *TOF  = new AliTOFv4T0("TOF","normal TOF");
+    AliTOF *TOF  = new AliTOFv5T0("TOF","normal TOF");
   }
 
   if(iRICH) {
@@ -579,6 +560,33 @@ AliGenPythia *PythiaHVQ(ProcessHvFl_t proc) {
     gener->SetPtHard(2.1,-1.0);
     gener->SetEnergyCMS(14000.);
     break;
+  case kDPlusPbPb5500:
+    comment = comment.Append(" DPlus in Pb-Pb at 5.5 TeV");
+    gener = new AliGenPythia(nEvts);
+    gener->SetProcess(kPyDPlusPbPbMNR);
+    gener->SetStrucFunc(kCTEQ4L);
+    gener->SetPtHard(2.1,-1.0);
+    gener->SetEnergyCMS(5500.);
+    gener->SetNuclei(208,208);
+    break;
+  case kDPluspPb8800:
+    comment = comment.Append(" DPlus in p-Pb at 8.8 TeV");
+    gener = new AliGenPythia(nEvts);
+    gener->SetProcess(kPyDPluspPbMNR);
+    gener->SetStrucFunc(kCTEQ4L);
+    gener->SetPtHard(2.1,-1.0);
+    gener->SetEnergyCMS(8800.);
+    gener->SetProjectile("P",1,1);
+    gener->SetTarget("Pb",208,82);
+    break;
+  case kDPluspp14000:
+    comment = comment.Append(" DPlus in pp at 14 TeV");
+    gener = new AliGenPythia(nEvts);
+    gener->SetProcess(kPyDPlusppMNR);
+    gener->SetStrucFunc(kCTEQ4L);
+    gener->SetPtHard(2.1,-1.0);
+    gener->SetEnergyCMS(14000.);
+    break;
   case kBeautyPbPb5500:
     comment = comment.Append(" Beauty in Pb-Pb at 5.5 TeV");
     gener = new AliGenPythia(nEvts);