Disable test of requested CDB objects similarity in sim and rec in case the sim has...

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

diff --git a/PYTHIA8/AliPythia8.cxx b/PYTHIA8/AliPythia8.cxx
index a3afc09c387172fbec5847d6b8ed28d5573c7ad5..b9f0f526831003a349f3fb0679ea7686f8dea60c 100644 (file)
--- a/PYTHIA8/AliPythia8.cxx
+++ b/PYTHIA8/AliPythia8.cxx
@@ -95,7 +95,7 @@ AliPythia8::AliPythia8(const AliPythia8& pythia):
     pythia.Copy(*this);
 }
 
-void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfunc)
+void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfunc, Int_t tune)
 {
 // Initialise the process to generate 
     if (!AliPythiaRndm::GetPythiaRandom()) 
@@ -133,14 +133,14 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
 //        Multiple interactions on.
        ReadString("PartonLevel:MI = on");
 // Double Gaussian matter distribution.
-       ReadString("MultipleInteractions:bProfile = 2");
-       ReadString("MultipleInteractions:coreFraction = 0.5");
-       ReadString("MultipleInteractions:coreRadius = 0.4");
+       ReadString("MultipartonInteractions:bProfile = 2");
+       ReadString("MultipartonInteractions:coreFraction = 0.5");
+       ReadString("MultipartonInteractions:coreRadius = 0.4");
 //  pT0.
-       ReadString("MultipleInteractions:pTmin = 2.0");
+       ReadString("MultipartonInteractions:pTmin = 2.0");
 //  Reference energy for pT0 and energy rescaling pace.
-       ReadString("MultipleInteractions:ecmRef = 1800.");
-       ReadString("MultipleInteractions:ecmPow = 0.25");
+       ReadString("MultipartonInteractions:ecmRef = 1800.");
+       ReadString("MultipartonInteractions:ecmPow = 0.25");
 //  String drawing almost completely minimizes string length.
 //     SetPARP(85,0.9);
 //     SetPARP(86,0.95);
@@ -231,7 +231,7 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        ReadString("SoftQCD:minBias = on");
        ReadString("SoftQCD:singleDiffractive = on");
        ReadString("SoftQCD:doubleDiffractive = on");
-       AtlasTuning();
+       if (tune == -1) AtlasTuning();
        break;
     case kPyMbDefault:
 // Minimum Bias pp-Collisions
@@ -241,6 +241,8 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        ReadString("SoftQCD:minBias = on");
        ReadString("SoftQCD:singleDiffractive = on");
        ReadString("SoftQCD:doubleDiffractive = on");
+       ReadString("SoftQCD:doubleDiffractive = on");
+       if (tune > -1) ReadString(Form("Tune:pp = %3d", tune));
        break;
     case kPyLhwgMb:
 // Les Houches Working Group 05 Minimum Bias pp-Collisions: hep-ph/0604120
@@ -509,7 +511,28 @@ 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");
+      break;
+    case kPyMBRDoubleDiffraction:
+      ReadString("Diffraction:PomFlux = 5");
+      ReadString("SoftQCD:doubleDiffractive = on");
+      break;
+    case kPyMBRCentralDiffraction: 
+      ReadString("Diffraction:PomFlux = 5");
+      ReadString("SoftQCD:centralDiffractive = on");
+      break;
     case kPyMbWithDirectPhoton:
     case kPyBeautyJets:
     case kPyMbAtlasTuneMC09: 
@@ -672,6 +695,7 @@ void AliPythia8::AtlasTuning()
 //     SetPARP(85,0.33);          // Regulates gluon prod. mechanism
 //     SetPARP(86,0.66);          // Regulates gluon prod. mechanism
     ReadString("SigmaProcess:factorMultFac = 1.");
+    
 }
 
 void AliPythia8::SetPtHardRange(Float_t ptmin, Float_t ptmax)
@@ -717,6 +741,7 @@ void AliPythia8::SetInitialAndFinalStateRadiation(Int_t flag1, Int_t flag2)
 
 void AliPythia8::SetIntrinsicKt(Float_t kt)
 {
+// Set the intrinsic kt
        ReadString("BeamRemnants:primordialKT = on");
        ReadString("BeamRemnants:primordialKTsoft = 0.");
        ReadString(Form("BeamRemnants:primordialKThard = %13.3f", kt));