Update for PDC'06 muon generation. (Nicole Bastid)

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index 9d4725a415d641ec72e99425ce61d3b304227eeb..8f3958ed4562e5c652acaade10d60a7ba01b073f 100644 (file)
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -343,6 +343,7 @@ void AliGenPythia::Init()
        break;
     case kPyMb:
     case kPyMbNonDiffr:
        break;
     case kPyMb:
     case kPyMbNonDiffr:

+    case kPyMbMSEL1:

     case kPyJets:
     case kPyDirectGamma:
        break;
     case kPyJets:
     case kPyDirectGamma:
        break;


@@ -356,17 +357,17 @@ void AliGenPythia::Init()
 //
 //  Configure detector (EMCAL like)
 //
 //
 //  Configure detector (EMCAL like)
 //

-       fPythia->SetPARU(51, fPycellEtaMax);
-       fPythia->SetMSTU(51, fPycellNEta);
-       fPythia->SetMSTU(52, fPycellNPhi);
+    fPythia->SetPARU(51, fPycellEtaMax);
+    fPythia->SetMSTU(51, fPycellNEta);
+    fPythia->SetMSTU(52, fPycellNPhi);

 //
 //  Configure Jet Finder
 //  
 //
 //  Configure Jet Finder
 //  

-       fPythia->SetPARU(58,  fPycellThreshold);
-       fPythia->SetPARU(52,  fPycellEtSeed);
-       fPythia->SetPARU(53,  fPycellMinEtJet);
-       fPythia->SetPARU(54,  fPycellMaxRadius);
-       fPythia->SetMSTU(54,  2);
+    fPythia->SetPARU(58,  fPycellThreshold);
+    fPythia->SetPARU(52,  fPycellEtSeed);
+    fPythia->SetPARU(53,  fPycellMinEtJet);
+    fPythia->SetPARU(54,  fPycellMaxRadius);
+    fPythia->SetMSTU(54,  2);

 //
 //  This counts the total number of calls to Pyevnt() per run.
     fTrialsRun = 0;
 //
 //  This counts the total number of calls to Pyevnt() per run.
     fTrialsRun = 0;


@@ -385,11 +386,10 @@ void AliGenPythia::Init()
        fDyBoost = 0;
        Warning("Init","SetNuclei used. Use SetProjectile + SetTarget instead. fDyBoost has been reset to 0\n");
     }
        fDyBoost = 0;
        Warning("Init","SetNuclei used. Use SetProjectile + SetTarget instead. fDyBoost has been reset to 0\n");
     }

-
+    

     if (fQuench) {
        fPythia->InitQuenching(0., 0.1, 0.6e6, 0);
     }
     if (fQuench) {
        fPythia->InitQuenching(0., 0.1, 0.6e6, 0);
     }

-    

 }
 
 void AliGenPythia::Generate()
 }
 
 void AliGenPythia::Generate()


@@ -489,6 +489,7 @@ void AliGenPythia::Generate()
        if (fProcess != kPyMb && fProcess != kPyJets && 
            fProcess != kPyDirectGamma &&
            fProcess != kPyMbNonDiffr  &&
        if (fProcess != kPyMb && fProcess != kPyJets && 
            fProcess != kPyDirectGamma &&
            fProcess != kPyMbNonDiffr  &&

+           fProcess != kPyMbMSEL1     &&

            fProcess != kPyW && fProcess != kPyZ &&
            fProcess != kPyCharmppMNRwmi && fProcess != kPyBeautyppMNRwmi) {
            
            fProcess != kPyW && fProcess != kPyZ &&
            fProcess != kPyCharmppMNRwmi && fProcess != kPyBeautyppMNRwmi) {
            

diff --git a/PYTHIA6/AliPythia.cxx b/PYTHIA6/AliPythia.cxx
index 3df3270e25c70fe01685c363da1084ff48fe8574..2902e85cc75fe82e96d820782e970fbfaddf68bc 100644 (file)
--- a/PYTHIA6/AliPythia.cxx
+++ b/PYTHIA6/AliPythia.cxx
@@ -221,6 +221,19 @@ void AliPythia::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfun
        SetMSEL(0);
        SetMSUB(95,1);             // low pt production
 
        SetMSEL(0);
        SetMSUB(95,1);             // low pt production
 

+       AtlasTuning();
+       break;
+    case kPyMbMSEL1:
+       ConfigHeavyFlavor();
+// Intrinsic <kT^2>
+        SetMSTP(91,1);// Width (1=gaussian) primordial kT dist. inside hadrons
+        SetPARP(91,1.);     // <kT^2> = PARP(91,1.)^2
+        SetPARP(93,5.);     // Upper cut-off
+// Set Q-quark mass
+        SetPMAS(4,1,1.2);   // Charm quark mass
+        SetPMAS(5,1,4.78);  // Beauty quark mass
+       SetPARP(71,4.);     // Defaut value
+// Atlas Tuning

        AtlasTuning();
        break;
     case kPyJets:
        AtlasTuning();
        break;
     case kPyJets:

diff --git a/PYTHIA6/AliPythia.h b/PYTHIA6/AliPythia.h
index 0cb2e600b44ed0c5b319aa5eb65166ec4d03dfab..c812b730b1cec3d65c825b524fcf96178bc4fecb 100644 (file)
--- a/PYTHIA6/AliPythia.h
+++ b/PYTHIA6/AliPythia.h
@@ -14,7 +14,7 @@ typedef enum
  kPyCharmPbPbMNR, kPyD0PbPbMNR, kPyDPlusPbPbMNR, kPyDPlusStrangePbPbMNR, kPyBeautyPbPbMNR,
  kPyCharmpPbMNR, kPyD0pPbMNR, kPyDPluspPbMNR, kPyDPlusStrangepPbMNR, kPyBeautypPbMNR,
  kPyCharmppMNR, kPyCharmppMNRwmi, kPyD0ppMNR, kPyDPlusppMNR, kPyDPlusStrangeppMNR, 
  kPyCharmPbPbMNR, kPyD0PbPbMNR, kPyDPlusPbPbMNR, kPyDPlusStrangePbPbMNR, kPyBeautyPbPbMNR,
  kPyCharmpPbMNR, kPyD0pPbMNR, kPyDPluspPbMNR, kPyDPlusStrangepPbMNR, kPyBeautypPbMNR,
  kPyCharmppMNR, kPyCharmppMNRwmi, kPyD0ppMNR, kPyDPlusppMNR, kPyDPlusStrangeppMNR, 

- kPyBeautyppMNR, kPyBeautyppMNRwmi, kPyW, kPyZ,
+ kPyBeautyppMNR, kPyBeautyppMNRwmi, kPyW, kPyZ, kPyMbMSEL1,

  kPyOldUEQ2ordered, kPyOldUEQ2ordered2, kPyOldPopcorn}
 Process_t;
 /*
  kPyOldUEQ2ordered, kPyOldUEQ2ordered2, kPyOldPopcorn}
 Process_t;
 /*