From 7d09f746e6b920c77406de7bdaf691b710b56408 Mon Sep 17 00:00:00 2001 From: morsch Date: Sat, 9 Oct 2010 15:52:22 +0000 Subject: [PATCH] Updates.x --- PYTHIA8/AliDecayerPythia8.cxx | 3 + PYTHIA8/AliPythia8.cxx | 115 +++++++++++++++++----------------- 2 files changed, 62 insertions(+), 56 deletions(-) diff --git a/PYTHIA8/AliDecayerPythia8.cxx b/PYTHIA8/AliDecayerPythia8.cxx index 86599d8c8a6..abfde8746df 100644 --- a/PYTHIA8/AliDecayerPythia8.cxx +++ b/PYTHIA8/AliDecayerPythia8.cxx @@ -566,6 +566,9 @@ void AliDecayerPythia8::ForceDecay() case kNoDecayBeauty: case kNeutralPion: case kPsiPrimeJpsiDiElectron: + case kElectronEM: + case kGammaEM: + case kDiElectronEM: break; } } diff --git a/PYTHIA8/AliPythia8.cxx b/PYTHIA8/AliPythia8.cxx index a57bd8caecc..3f807515a7b 100644 --- a/PYTHIA8/AliPythia8.cxx +++ b/PYTHIA8/AliPythia8.cxx @@ -184,11 +184,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu ReadString("ParticleData:mcRun = 1.2"); // // primordial pT - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1."); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1."); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); break; case kPyBeauty: ReadString("HardQCD:gg2bbbar = on"); @@ -270,11 +270,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu case kPyMbMSEL1: ConfigHeavyFlavor(); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1."); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1."); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set Q-quark mass ReadString("ParticleData:mcRun = 1.20"); ReadString("ParticleData:mbRun = 4.78"); @@ -317,11 +317,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // has to be set to 2.1GeV. Example in ConfigCharmPPR.C. ConfigHeavyFlavor(); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1.304"); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1.304"); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set c-quark mass ReadString("ParticleData:mcRun = 1.20"); break; @@ -338,11 +338,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // has to be set to 2.1GeV. Example in ConfigCharmPPR.C. ConfigHeavyFlavor(); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1.16"); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1.16"); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set c-quark mass ReadString("ParticleData:mcRun = 1.20"); break; @@ -350,6 +350,7 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu case kPyD0ppMNR: case kPyDPlusppMNR: case kPyDPlusStrangeppMNR: + case kPyLambdacppMNR: // Tuning of Pythia parameters aimed to get a resonable agreement // between with the NLO calculation by Mangano, Nason, Ridolfi for the // c-cbar single inclusive and double differential distributions. @@ -359,11 +360,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // has to be set to 2.1GeV. Example in ConfigCharmPPR.C. ConfigHeavyFlavor(); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1."); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1."); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set c-quark mass ReadString("ParticleData:mcRun = 1.20"); break; @@ -386,11 +387,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // >8 GeV: 6% ConfigHeavyFlavor(); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1."); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1."); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set c-quark mass ReadString("ParticleData:mcRun = 1.20"); AtlasTuning(); @@ -407,11 +408,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // QCD scales ReadString("SigmaProcess:factorMultFac = 1."); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 2.035"); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 2.035"); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set b-quark mass ReadString("ParticleData:mbRun = 4.75"); break; @@ -427,11 +428,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // QCD scales ReadString("SigmaProcess:factorMultFac = 1."); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1.6"); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1.6"); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set b-quark mass ReadString("ParticleData:mbRun = 4.75"); break; @@ -447,11 +448,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // QCD scales ReadString("SigmaProcess:factorMultFac = 1."); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1.0"); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1.0"); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set b-quark mass ReadString("ParticleData:mbRun = 4.75"); break; @@ -476,11 +477,11 @@ void AliPythia8::ProcInit(Process_t process, Float_t energy, StrucFunc_t strucfu // QCD scales ReadString("SigmaProcess:factorMultFac = 1."); // Intrinsic - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString("Beams:primordialKThard = 1.0"); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString("BeamRemnants:primordialKThard = 1.0"); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); // Set b-quark mass ReadString("ParticleData:mbRun = 4.75"); AtlasTuning(); @@ -618,7 +619,9 @@ void AliPythia8::EventListing() Int_t AliPythia8::ProcessCode() { // Returns the subprocess code for the current event - return Pythia8()->info.code(); + printf("Process %5d %5d \n", Pythia8()->info.code(), Pythia8()->info.codeSub()); + + return Pythia8()->info.codeSub(); } void AliPythia8::ConfigHeavyFlavor() @@ -708,11 +711,11 @@ void AliPythia8::SetInitialAndFinalStateRadiation(Int_t flag1, Int_t flag2) void AliPythia8::SetIntrinsicKt(Float_t kt) { - ReadString("Beams:primordialKT = on"); - ReadString("Beams:primordialKTsoft = 0."); - ReadString(Form("Beams:primordialKThard = %13.3f", kt)); - ReadString("Beams:halfScaleForKT = 0."); - ReadString("Beams:halfMassForKT = 0."); + ReadString("BeamRemnants:primordialKT = on"); + ReadString("BeamRemnants:primordialKTsoft = 0."); + ReadString(Form("BeamRemnants:primordialKThard = %13.3f", kt)); + ReadString("BeamRemnants:halfScaleForKT = 0."); + ReadString("BeamRemnants:halfMassForKT = 0."); } void AliPythia8::SwitchHFOff() -- 2.39.3