Access to the geometry updated

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

diff --git a/PYTHIA6/AliPythia.cxx b/PYTHIA6/AliPythia.cxx
index 68400ea9e8e00d94e920a6324e6b3fc5c25a8d39..7f2663d3587a6142ad0edcdc927838904e2b724c 100644 (file)
--- a/PYTHIA6/AliPythia.cxx
+++ b/PYTHIA6/AliPythia.cxx
@@ -58,6 +58,8 @@ AliPythia::AliPythia():
     fStrucFunc(kCTEQ5L),
     fXJet(0.),
     fYJet(0.),
+    fNGmax(30),
+    fZmax(0.97),
     fGlauber(0),
     fQuenchingWeights(0)
 {
@@ -78,6 +80,8 @@ AliPythia::AliPythia(const AliPythia& pythia):
     fStrucFunc(kCTEQ5L),
     fXJet(0.),
     fYJet(0.),
+    fNGmax(30),
+    fZmax(0.97),
     fGlauber(0),
     fQuenchingWeights(0)
 {
@@ -237,6 +241,18 @@ void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfun
        SetMSUB(95,1);             // low pt production
 
        AtlasTuning();
+       break;
+    case kPyMbDefault:
+// Minimum Bias pp-Collisions
+//
+//   
+//      select Pythia min. bias model
+       SetMSEL(0);
+       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
+
        break;
     case kPyLhwgMb:
 // Les Houches Working Group 05 Minimum Bias pp-Collisions: hep-ph/0604120
@@ -645,7 +661,7 @@ void AliPythia::Pyrobo(Int_t imi, Int_t ima, Double_t the, Double_t phi, Double_
 
 
 
-void AliPythia::InitQuenching(Float_t cMin, Float_t cMax, Float_t k, Int_t iECMethod)
+void AliPythia::InitQuenching(Float_t cMin, Float_t cMax, Float_t k, Int_t iECMethod, Float_t zmax, Int_t ngmax)
 {
 // Initializes 
 // (1) The quenching model using quenching weights according to C. Salgado and U. Wiedemann
@@ -660,6 +676,9 @@ void AliPythia::InitQuenching(Float_t cMin, Float_t cMax, Float_t k, Int_t iECMe
     fQuenchingWeights->InitMult();
     fQuenchingWeights->SetK(k);
     fQuenchingWeights->SetECMethod(AliQuenchingWeights::kECMethod(iECMethod));
+    fNGmax = ngmax;
+    fZmax  = zmax;
+    
 }
 
 
@@ -777,7 +796,7 @@ void  AliPythia::Quench()
            //
            // Avoid complete loss
            //
-           if (fZQuench[j] == 1.) fZQuench[j] = 0.97;
+           if (fZQuench[j] == 1.) fZQuench[j] = fZmax;
            //
            // Some debug printing
 
@@ -806,7 +825,7 @@ void  AliPythia::Quench()
        if (!quenched[isys]) continue;
        
        nGluon[isys]   = 1 + Int_t(fZQuench[isys] / (1. - fZQuench[isys]));
-       if (nGluon[isys] > 30) nGluon[isys] = 30;
+       if (nGluon[isys] > fNGmax) nGluon[isys] = fNGmax;
        zquench[isys] = 1. - TMath::Power(1. - fZQuench[isys], 1./Double_t(nGluon[isys]));
        wjtKick[isys]  = wjtKick[isys] / TMath::Sqrt(Double_t(nGluon[isys]));
 
@@ -1220,6 +1239,8 @@ void AliPythia::ConfigHeavyFlavor()
     
     // No multiple interactions
     SetMSTP(81,0);
+    SetPARP(81, 0.);
+    SetPARP(82, 0.);    
     // Initial/final parton shower on (Pythia default)
     SetMSTP(61,1);
     SetMSTP(71,1);
@@ -1239,6 +1260,7 @@ void AliPythia::AtlasTuning()
         SetMSTP(51, kCTEQ5L);      // CTEQ5L pdf
        SetMSTP(81,1);             // Multiple Interactions ON
        SetMSTP(82,4);             // Double Gaussian Model
+       SetPARP(81,1.9);           // Min. pt for multiple interactions (default in 6.2-14) 
        SetPARP(82,1.8);           // [GeV]    PT_min at Ref. energy
        SetPARP(89,1000.);         // [GeV]   Ref. energy
        SetPARP(90,0.16);          // 2*epsilon (exponent in power law)