Reverting an unintented commit.
[u/mrichter/AliRoot.git] / PYTHIA8 / AliPythia8.cxx
index c66154c..2bfe0d9 100644 (file)
@@ -53,7 +53,7 @@ ClassImp(AliPythia8)
 AliPythia8* AliPythia8::fgAliPythia8=NULL;
 
 AliPythia8::AliPythia8():
-    TPythia8(),
+    AliTPythia8(),
     AliPythiaBase(),
     fProcess(kPyMb),
     fEcms(0.),
@@ -74,7 +74,7 @@ AliPythia8::AliPythia8():
 }
 
 AliPythia8::AliPythia8(const AliPythia8& pythia):
-    TPythia8(), 
+    AliTPythia8(), 
     AliPythiaBase(),
     fProcess(kPyMb),
     fEcms(0.),
@@ -184,11 +184,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 +270,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 +317,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 +338,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 +350,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 +360,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 +387,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 +408,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 +428,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 +448,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 +477,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();
@@ -594,7 +595,7 @@ void AliPythia8::GetJet(Int_t i, Float_t& px, Float_t& py, Float_t& pz, Float_t&
 void AliPythia8::GenerateEvent()
 {
     // Generate one event
-    TPythia8::GenerateEvent();
+    AliTPythia8::GenerateEvent();
 }
 
 void AliPythia8::GenerateMIEvent()
@@ -606,19 +607,19 @@ void AliPythia8::GenerateMIEvent()
 void AliPythia8::PrintStatistics()
 {
     // End of run statistics
-    TPythia8::PrintStatistics();
+    AliTPythia8::PrintStatistics();
 }
 
 void AliPythia8::EventListing()
 {
     // End of run statistics
-    TPythia8::EventListing();
+    AliTPythia8::EventListing();
 }
 
 Int_t AliPythia8::ProcessCode()
 {
     // Returns the subprocess code for the current event
-    return Pythia8()->info.codeSub();
+    return Pythia8()->info.code();
 }
 
 void AliPythia8::ConfigHeavyFlavor()
@@ -708,11 +709,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()