kPyMbDefault back to what it was.

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index 6523bc601b4fa5a7efb3dff789335648b4d550aa..b3dae11cf44769faddcccc78f870f737a68959c7 100644 (file)
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -653,6 +653,7 @@ void AliGenPythia::Generate()
        Int_t nTkbles = 0;   // Trackable particles
        if (fProcess != kPyMbDefault && 
            fProcess != kPyMb && 
+           fProcess != kPyMbAtlasTuneMC09 && 
            fProcess != kPyMbWithDirectPhoton && 
            fProcess != kPyJets && 
            fProcess != kPyDirectGamma &&
@@ -907,7 +908,7 @@ Int_t  AliGenPythia::GenerateMB()
 
       Int_t pdg  = 0; 
       if (fFragPhotonInCalo) pdg = 22   ; // Photon
-      else if (fPi0InCalo) pdg = 111 ;    // Pi0
+      else if (fPi0InCalo)   pdg = 111 ;    // Pi0
 
       for (i=0; i< np; i++) {
        TParticle* iparticle = (TParticle *) fParticles.At(i);
@@ -955,7 +956,6 @@ Int_t  AliGenPythia::GenerateMB()
        return 0;
       AliDebug(5,Form("Found an electron jet (pt,eta,phi) = (%f,%f,%f)",pt,eta,phi));
     }
-    
     // Check for minimum multiplicity
     if (fTriggerMultiplicity > 0) {
       Int_t multiplicity = 0;
@@ -985,7 +985,6 @@ Int_t  AliGenPythia::GenerateMB()
        delete [] pParent;
        return 0;
       }
-      
       Printf("Triggered on event with multiplicity of %d >= %d", multiplicity, fTriggerMultiplicity);
     }    
     
@@ -1090,6 +1089,7 @@ Int_t  AliGenPythia::GenerateMB()
          fProcess == kPyZ ||
          fProcess == kPyMbDefault ||
          fProcess == kPyMb ||
+         fProcess == kPyMbAtlasTuneMC09 ||
          fProcess == kPyMbWithDirectPhoton ||
          fProcess == kPyMbNonDiffr)  
         && (fCutOnChild == 1) ) {

diff --git a/PYTHIA6/AliPythia.cxx b/PYTHIA6/AliPythia.cxx
index 1fe1c4a317f8ad19cb9c45cda9227d03f4d2c34e..3c199428e5e98ff0e0e28e0d09b5a11c749f9a6b 100644 (file)
--- a/PYTHIA6/AliPythia.cxx
+++ b/PYTHIA6/AliPythia.cxx
@@ -298,20 +298,10 @@ void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfun
 //   
 //      select Pythia min. bias model
        SetMSEL(0);
-       SetMSUB(92,0);             // single diffraction AB-->XB
-       SetMSUB(93,0);             // single diffraction AB-->AX
+       SetMSUB(92,1);             // single diffraction AB-->XB
+       SetMSUB(93,1);             // single diffraction AB-->AX
        SetMSUB(94,1);             // double diffraction
        SetMSUB(95,1);             // low pt production
-
-       SetPARP(67,2.5);           // Regulates Initial State Radiation (value from best fit to D0 dijet analysis)
-       SetMSTP(82,4);             // Double Gaussian Model
-       SetPARP(82,2.0);           // [GeV]    PT_min at Ref. energy
-       SetPARP(84,0.4);           // Core radius
-       SetPARP(85,0.90) ;         // Regulates gluon prod. mechanism
-       SetPARP(86,0.95);          // Regulates gluon prod. mechanism
-       SetPARP(89,1800.);         // [GeV]   Ref. energy
-       SetPARP(90,0.25);          // 2*epsilon (exponent in power law)
-
        break;
     case kPyLhwgMb:
 // Les Houches Working Group 05 Minimum Bias pp-Collisions: hep-ph/0604120