Merge branch 'MyDevBranch'

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

diff --git a/PYTHIA8/AliPythia8.cxx b/PYTHIA8/AliPythia8.cxx
index 834e1c695ce0f3ce031b4b1c088a694d4188f624..45030e1001b0e1da1337e6412a9985cc2f0c2a6f 100644 (file)
--- a/PYTHIA8/AliPythia8.cxx
+++ b/PYTHIA8/AliPythia8.cxx
@@ -54,7 +54,7 @@ AliPythia8* AliPythia8::fgAliPythia8=NULL;
 
 AliPythia8::AliPythia8():
     AliTPythia8(),
-    AliPythiaBase(),
+    //    AliPythiaBase(),
     fProcess(kPyMb),
     fEcms(0.),
     fStrucFunc(kCTEQ5L),
@@ -77,7 +77,7 @@ AliPythia8::AliPythia8():
 
 AliPythia8::AliPythia8(const AliPythia8& pythia):
     AliTPythia8(), 
-    AliPythiaBase(),
+    //    AliPythiaBase(),
     fProcess(kPyMb),
     fEcms(0.),
     fStrucFunc(kCTEQ5L),
@@ -104,8 +104,8 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
     fProcess   = process;
     fEcms      = energy;
     fStrucFunc = strucfunc;
-//...Switch off decay of pi0, K0S, Lambda, Sigma+-, Xi0-, Omega-.
-    ReadString("111:mayDecay  = off");
+    ReadString("111:mayDecay  = on");
+//...Switch off decay of K0L, Lambda, Sigma+-, Xi0-, Omega-.
     ReadString("310:mayDecay  = off");
     ReadString("3122:mayDecay = off");
     ReadString("3112:mayDecay = off");
@@ -115,11 +115,9 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
     ReadString("3322:mayDecay = off");
     ReadString("3334:mayDecay = off");
     // Select structure function 
-
-    ReadString("PDF:useLHAPDF = on");
-    ReadString(Form("PDF:LHAPDFset = %s", AliStructFuncType::PDFsetName(fStrucFunc).Data()));
-
-    // Particles produced in string fragmentation point directly to either of the two endpoints
+          ReadString("PDF:useLHAPDF = on");
+         ReadString(Form("PDF:LHAPDFset = %s", AliStructFuncType::PDFsetName(fStrucFunc).Data()));
+      // Particles produced in string fragmentation point directly to either of the two endpoints
     // of the string (depending in the side they were generated from).
 
 //    SetMSTU(16,2); // ????
@@ -243,6 +241,7 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        ReadString("SoftQCD:doubleDiffractive = on");
        ReadString("SoftQCD:doubleDiffractive = on");
        if (tune > -1) ReadString(Form("Tune:pp = %3d", tune));
+       ReadString("PDF:useLHAPDF = off");
        break;
     case kPyLhwgMb:
 // Les Houches Working Group 05 Minimum Bias pp-Collisions: hep-ph/0604120
@@ -511,7 +510,16 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        // With parton showers on we are generating "Z inclusive process"
        ReadString("PartonLevel:ISR = on");
        ReadString("PartonLevel:FSR = on");
-       break;  
+       break;
+    case kPyZgamma:
+        //Inclusive production of Z/gamma*
+        //f fbar -> Z/gamma
+        ReadString("WeakSingleBoson:ffbar2gmZ = on");
+        // Initial/final parton shower on (Pythia default)
+        // With parton showers on we are generating "Z inclusive process"
+        ReadString("PartonLevel:ISR = on");
+        ReadString("PartonLevel:FSR = on");
+        break;
     case kPyMBRSingleDiffraction:
       ReadString("Diffraction:PomFlux = 5");
       ReadString("SoftQCD:singleDiffractive = on");