From b250034f2f1b448884edb986131b0fb303425229 Mon Sep 17 00:00:00 2001 From: Meng_Lu <1501110102@pku.edu.cn> Date: Fri, 2 Jun 2023 11:10:36 +0200 Subject: [PATCH 1/2] Update ReweightUserHooks.h --- .../Pythia8Interface/plugins/ReweightUserHooks.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h b/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h index 886e5faac1c16..5792ef54de5f2 100644 --- a/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h +++ b/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h @@ -27,7 +27,7 @@ class PtHatReweightUserHook : public Pythia8::UserHooks { class PtHatEmpReweightUserHook : public Pythia8::UserHooks { public: PtHatEmpReweightUserHook(const std::string& tuneName = "") { - if (tuneName == "CP5") + if (tuneName == "CP5" || tuneName == "CP5Run3") p = {7377.94700788, 8.38168461349, -4.70983112392, -0.0310148108446, -0.028798537937, 925.335472326}; //Default reweighting - works good for tune CUEPT8M1 else @@ -37,9 +37,10 @@ class PtHatEmpReweightUserHook : public Pythia8::UserHooks { -5.1575514014931e-01, 5.5951279807561e-02, 3.5e+02}; + const double ecms = (tuneName == "CP5Run3" ? 13600. : 13000.); sigma = [this](double x) -> double { return (p[0] * pow(x, p[2] + p[3] * log(0.01 * x) + p[4] * pow(log(0.01 * x), 2)) * - pow(1 - 2 * x / (13000. + p[5]), p[1])) * + pow(1 - 2 * x / (ecms + p[5]), p[1])) * x; }; } From 265071478fea26e1ab31b4de228fa55998581956 Mon Sep 17 00:00:00 2001 From: Meng_Lu <1501110102@pku.edu.cn> Date: Fri, 2 Jun 2023 11:13:04 +0200 Subject: [PATCH 2/2] Update ReweightUserHooks.h --- GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h b/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h index 5792ef54de5f2..3e3d2897bf2c6 100644 --- a/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h +++ b/GeneratorInterface/Pythia8Interface/plugins/ReweightUserHooks.h @@ -38,7 +38,7 @@ class PtHatEmpReweightUserHook : public Pythia8::UserHooks { 5.5951279807561e-02, 3.5e+02}; const double ecms = (tuneName == "CP5Run3" ? 13600. : 13000.); - sigma = [this](double x) -> double { + sigma = [this, ecms](double x) -> double { return (p[0] * pow(x, p[2] + p[3] * log(0.01 * x) + p[4] * pow(log(0.01 * x), 2)) * pow(1 - 2 * x / (ecms + p[5]), p[1])) * x;