Removing the flat makefiles

[u/mrichter/AliRoot.git] / PYTHIA8 / AliPythia8.cxx

diff --git a/PYTHIA8/AliPythia8.cxx b/PYTHIA8/AliPythia8.cxx
index a57bd8caecc5f88b9f8daaf18af764fa7b2bdd77..a3afc09c387172fbec5847d6b8ed28d5573c7ad5 100644 (file)
--- a/PYTHIA8/AliPythia8.cxx
+++ b/PYTHIA8/AliPythia8.cxx
@@ -58,9 +58,11 @@ AliPythia8::AliPythia8():
     fProcess(kPyMb),
     fEcms(0.),
     fStrucFunc(kCTEQ5L),
+    fCellJet(),
     fEtSeed(0.),
     fMinEtJet(0.),
     fRJet(0.),
+    fClusterJet(),
     fYScale(0.),
     fPtScale(0.),
     fNJetMin(0),
@@ -79,9 +81,11 @@ AliPythia8::AliPythia8(const AliPythia8& pythia):
     fProcess(kPyMb),
     fEcms(0.),
     fStrucFunc(kCTEQ5L),
+    fCellJet(),
     fEtSeed(0.),
     fMinEtJet(0.),
     fRJet(0.),
+    fClusterJet(),
     fYScale(0.),
     fPtScale(0.),
     fNJetMin(0),
@@ -184,11 +188,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        ReadString("ParticleData:mcRun = 1.2");
 //
 //    primordial pT
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
        break;
     case kPyBeauty:
        ReadString("HardQCD:gg2bbbar = on");
@@ -270,11 +274,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
     case kPyMbMSEL1:
        ConfigHeavyFlavor();
 // Intrinsic <kT^2>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
 // Set Q-quark mass
        ReadString("ParticleData:mcRun = 1.20");
        ReadString("ParticleData:mbRun = 4.78");
@@ -317,11 +321,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
       // has to be set to 2.1GeV. Example in ConfigCharmPPR.C.
        ConfigHeavyFlavor();
       // Intrinsic <kT>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.304");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.304");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
       // Set c-quark mass
        ReadString("ParticleData:mcRun = 1.20");
        break;
@@ -338,11 +342,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
       // has to be set to 2.1GeV. Example in ConfigCharmPPR.C.
        ConfigHeavyFlavor();
       // Intrinsic <kT>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.16");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.16");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
       // Set c-quark mass
        ReadString("ParticleData:mcRun = 1.20");
       break;
@@ -350,6 +354,7 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
     case kPyD0ppMNR:
     case kPyDPlusppMNR:
     case kPyDPlusStrangeppMNR:
+    case kPyLambdacppMNR:
       // Tuning of Pythia parameters aimed to get a resonable agreement
       // between with the NLO calculation by Mangano, Nason, Ridolfi for the
       // c-cbar single inclusive and double differential distributions.
@@ -359,11 +364,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
       // has to be set to 2.1GeV. Example in ConfigCharmPPR.C.
        ConfigHeavyFlavor();
       // Intrinsic <kT^2>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
       // Set c-quark mass
        ReadString("ParticleData:mcRun = 1.20");
       break;
@@ -386,11 +391,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
       //     >8 GeV:  6%
        ConfigHeavyFlavor();
       // Intrinsic <kT^2>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
       // Set c-quark mass
        ReadString("ParticleData:mcRun = 1.20");
        AtlasTuning();
@@ -407,11 +412,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
       // QCD scales
        ReadString("SigmaProcess:factorMultFac = 1.");
       // Intrinsic <kT>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 2.035");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 2.035");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
       // Set b-quark mass
        ReadString("ParticleData:mbRun = 4.75");
       break;
@@ -427,11 +432,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
       // QCD scales
        ReadString("SigmaProcess:factorMultFac = 1.");
       // Intrinsic <kT>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.6");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.6");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
       // Set b-quark mass
        ReadString("ParticleData:mbRun = 4.75");
       break;
@@ -447,11 +452,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        // QCD scales
        ReadString("SigmaProcess:factorMultFac = 1.");
        // Intrinsic <kT>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.0");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.0");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
        // Set b-quark mass
        ReadString("ParticleData:mbRun = 4.75");
       break;
@@ -476,11 +481,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
         // QCD scales
         ReadString("SigmaProcess:factorMultFac = 1.");
         // Intrinsic <kT>
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString("Beams:primordialKThard = 1.0");
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString("BeamRemnants:primordialKThard = 1.0");
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
        // Set b-quark mass
        ReadString("ParticleData:mbRun = 4.75");
        AtlasTuning();
@@ -505,6 +510,10 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        ReadString("PartonLevel:ISR = on");
        ReadString("PartonLevel:FSR = on");
        break;  
+    case kPyMbWithDirectPhoton:
+    case kPyBeautyJets:
+    case kPyMbAtlasTuneMC09: 
+      break;
     }
 //
 //  Initialize PYTHIA
@@ -708,11 +717,11 @@ void AliPythia8::SetInitialAndFinalStateRadiation(Int_t flag1, Int_t flag2)
 
 void AliPythia8::SetIntrinsicKt(Float_t kt)
 {
-       ReadString("Beams:primordialKT = on");
-       ReadString("Beams:primordialKTsoft = 0.");
-       ReadString(Form("Beams:primordialKThard = %13.3f", kt));
-       ReadString("Beams:halfScaleForKT = 0.");
-       ReadString("Beams:halfMassForKT = 0.");
+       ReadString("BeamRemnants:primordialKT = on");
+       ReadString("BeamRemnants:primordialKTsoft = 0.");
+       ReadString(Form("BeamRemnants:primordialKThard = %13.3f", kt));
+       ReadString("BeamRemnants:halfScaleForKT = 0.");
+       ReadString("BeamRemnants:halfMassForKT = 0.");
 }
 
 void AliPythia8::SwitchHFOff()