option to switch CR off

[u/mrichter/AliRoot.git] / PYTHIA6 / AliGenPythiaPlus.cxx

diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx
index 799cd0ff5524ba4a885a1e66724b0d17208c0913..0f91b97fcce8f5933e52f5a29aea32c3347d784c 100644 (file)
--- a/PYTHIA6/AliGenPythiaPlus.cxx
+++ b/PYTHIA6/AliGenPythiaPlus.cxx
@@ -447,9 +447,10 @@ void AliGenPythiaPlus::Init()
     case kPyDirectGamma:
     case kPyLhwgMb:    
        break;
-    case kPyWPWHG: ///// !!!!!!!!!!!!!!!!!!!1 Change for W with POWEG !!!!!!!!!!!!!!!!!1 :)
+    case kPyWPWHG:
     case kPyW:
     case kPyZ:
+    case kPyZgamma:
     case kPyMBRSingleDiffraction:
     case kPyMBRDoubleDiffraction:
     case kPyMBRCentralDiffraction:
@@ -607,9 +608,10 @@ void AliGenPythiaPlus::Generate()
            fProcess != kPyMbMSEL1     &&
            fProcess != kPyW && 
            fProcess != kPyZ &&
+      fProcess != kPyZgamma &&
            fProcess != kPyCharmppMNRwmi && 
            fProcess != kPyBeautyppMNRwmi &&
-      fProcess != kPyWPWHG &&   /// !!!!!!!!!!!!!!!!!!! Change for W with POWHEG !!!!!!!!!!!!!!!!1 :)
+      fProcess != kPyWPWHG &&
            fProcess != kPyJetsPWHG &&
            fProcess != kPyCharmPWHG &&
      fProcess != kPyBeautyPWHG) {
@@ -977,9 +979,10 @@ Int_t  AliGenPythiaPlus::GenerateMB()
 
     //Introducing child cuts in case kPyW, kPyZ, kPyMb, and kPyMbNonDiff
     if ( (
-    fProcess == kPyWPWHG ||   // !!!!!!!!!!!!! Change for W with POWEG !!!!!!!!!!!!!!!1 :)
+    fProcess == kPyWPWHG ||
     fProcess == kPyW ||
          fProcess == kPyZ ||
+    fProcess == kPyZgamma ||
          fProcess == kPyMbDefault ||
          fProcess == kPyMb ||
          fProcess == kPyMbWithDirectPhoton ||