X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PYTHIA6%2FAliGenPythia.cxx;h=b3dae11cf44769faddcccc78f870f737a68959c7;hb=7e504402945160b41d29f078109bc81cefd84a4c;hp=b586a3f260d835bf735a574974d6be02fad55d0b;hpb=df275cfa1c3c20c1cadb9d525d323dc8dc0b8cb8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index b586a3f260d..b3dae11cf44 100644
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -461,6 +461,7 @@ void AliGenPythia::Init()
 	fParentSelect[0] = 443;
 	break;
     case kPyMbDefault:
+    case kPyMbAtlasTuneMC09:
     case kPyMb:
     case kPyMbWithDirectPhoton:
     case kPyMbNonDiffr:
@@ -652,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 &&
@@ -906,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);
@@ -954,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;
@@ -984,7 +985,6 @@ Int_t  AliGenPythia::GenerateMB()
 	delete [] pParent;
 	return 0;
       }
-      
       Printf("Triggered on event with multiplicity of %d >= %d", multiplicity, fTriggerMultiplicity);
     }    
     
@@ -1089,6 +1089,7 @@ Int_t  AliGenPythia::GenerateMB()
 	  fProcess == kPyZ ||
 	  fProcess == kPyMbDefault ||
 	  fProcess == kPyMb ||
+	  fProcess == kPyMbAtlasTuneMC09 ||
 	  fProcess == kPyMbWithDirectPhoton ||
 	  fProcess == kPyMbNonDiffr)  
 	 && (fCutOnChild == 1) ) {