Add /home/mtadel/alice-dev/trunk/aliroot/PWG0 to include path. After restructuring...

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

diff --git a/PYTHIA6/AliPythia6.cxx b/PYTHIA6/AliPythia6.cxx
index b0b126d0e730ae00d2f4d4cd77da0b52c2fee603..901788f81a620b8bf7e29e341ab8cc595a8ea3c5 100644 (file)
--- a/PYTHIA6/AliPythia6.cxx
+++ b/PYTHIA6/AliPythia6.cxx
@@ -249,6 +249,19 @@ void AliPythia6::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
 
        AtlasTuning();
        break;
+    case kPyMbAtlasTuneMC09:
+// 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
+
+       AtlasTuning_MC09();
+       break;
 
     case kPyMbWithDirectPhoton:
 // Minimum Bias pp-Collisions with direct photon processes added 
@@ -494,6 +507,7 @@ void AliPythia6::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu
        // Set b-quark mass
        SetPMAS(5,1,4.75);
       break;
+     case kPyBeautyJets: 
      case kPyBeautyppMNRwmi:
       // Tuning of Pythia parameters aimed to get a resonable agreement
       // between with the NLO calculation by Mangano, Nason, Ridolfi for the
@@ -704,7 +718,7 @@ void AliPythia6::InitQuenching(Float_t cMin, Float_t cMax, Float_t k, Int_t iECM
 // (2) The nuclear geometry using the Glauber Model
 //     
     
-    fGlauber = new AliFastGlauber();
+    fGlauber = AliFastGlauber::Instance();
     fGlauber->Init(2);
     fGlauber->SetCentralityClass(cMin, cMax); 
 
@@ -1142,7 +1156,7 @@ void  AliPythia6::Quench()
                //
                // Isotropic decay ????
                Double_t cost = 2. * gRandom->Rndm() - 1.;
-               Double_t sint = TMath::Sqrt(1. - cost * cost);
+               Double_t sint = TMath::Sqrt((1.-cost)*(1.+cost));
                Double_t phis =  2. * TMath::Pi() * gRandom->Rndm();
                
                Double_t pz1 =   pst * cost;
@@ -1382,6 +1396,37 @@ void AliPythia6::AtlasTuning()
        SetPARP(67,1);             // Regulates Initial State Radiation
 }
 
+void AliPythia6::AtlasTuning_MC09()
+{
+    //
+    // Configuration for the ATLAS tuning
+    printf("ATLAS New TUNE MC09\n");
+    SetMSTP(81,21);             // treatment for MI, ISR, FSR and beam remnants: MI on, new model
+    SetMSTP(82, 4);             // Double Gaussian Model
+    SetMSTP(52, 2);             // External PDF
+    SetMSTP(51, 20650);         // MRST LO*
+  
+    
+    SetMSTP(70, 0);             // (was 2: def manual 1, def code 0) virtuality scale for ISR 
+    SetMSTP(72, 1);             // (was 0: def 1) maximum scale for FSR
+    SetMSTP(88, 1);             // (was 0: def 1) strategy for qq junction to di-quark or baryon in beam remnant
+    SetMSTP(90, 0);             // (was 1: def 0) strategy of compensate the primordial kT
+
+    SetPARP(78, 0.3);           // the amount of color reconnection in the final state
+    SetPARP(80, 0.1);           // probability of color partons kicked out from beam remnant
+    SetPARP(82, 2.3);           // [GeV]    PT_min at Ref. energy    
+    SetPARP(83, 0.8);           // Core density in proton matter distribution (def.value)    
+    SetPARP(84, 0.7);           // Core radius
+    SetPARP(90, 0.25);          //  2*epsilon (exponent in power law)
+    SetPARJ(81, 0.29);          // (was 0.14: def 0.29) Labmda value in running alpha_s for parton showers
+
+    SetMSTP(95, 6);
+    SetPARJ(41, 0.3);           // a and b parameters of the symmm. Lund FF
+    SetPARJ(42, 0.58);
+    SetPARJ(46, 0.75);          // mod. of the Lund FF for heavy end-point quarks
+    SetPARP(89,1800.);         // [GeV]   Ref. energy
+}
+
 void AliPythia6::SetPtHardRange(Float_t ptmin, Float_t ptmax)
 {
     // Set the pt hard range