From 8b25432f258869f69641abf94d2b3380c3656c39 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Wed, 20 Nov 2024 23:19:14 +0100 Subject: [PATCH] Fix the LHCb `DY` (which includes both `Z0` and `W`) datasets --- .../commondata/LHCB_DY_7TEV_MUON/filter.py | 2 +- .../LHCB_DY_7TEV_MUON/kinematics.yaml | 66 +++++++++--------- .../LHCB_DY_7TEV_MUON/metadata.yaml | 8 +-- .../commondata/LHCB_DY_8TEV_MUON/filter.py | 2 +- .../LHCB_DY_8TEV_MUON/kinematics.yaml | 68 +++++++++---------- .../LHCB_DY_8TEV_MUON/metadata.yaml | 8 +-- validphys2/src/validphys/process_options.py | 15 +++- 7 files changed, 89 insertions(+), 80 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/filter.py b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/filter.py index 20529c30e7..da60d6a379 100644 --- a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/filter.py @@ -85,7 +85,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "Z") -> list: ymax = float(rapbins[bins]["high"]) kin_value = { "y": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax}, - "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None}, + "m_V2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None}, "sqrts": {"min": None, "mid": SQRT_S, "max": None}, } kinematics.append(kin_value) diff --git a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/kinematics.yaml index bbf8239698..c3ebaf7bbe 100644 --- a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/kinematics.yaml @@ -3,7 +3,7 @@ bins: min: 2.0 mid: 2.0625 max: 2.125 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -15,7 +15,7 @@ bins: min: 2.125 mid: 2.1875 max: 2.25 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -27,7 +27,7 @@ bins: min: 2.25 mid: 2.3125 max: 2.375 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -39,7 +39,7 @@ bins: min: 2.375 mid: 2.4375 max: 2.5 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -51,7 +51,7 @@ bins: min: 2.5 mid: 2.5625 max: 2.625 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -63,7 +63,7 @@ bins: min: 2.625 mid: 2.6875 max: 2.75 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -75,7 +75,7 @@ bins: min: 2.75 mid: 2.8125 max: 2.875 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -87,7 +87,7 @@ bins: min: 2.875 mid: 2.9375 max: 3.0 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -99,7 +99,7 @@ bins: min: 3.0 mid: 3.0625 max: 3.125 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -111,7 +111,7 @@ bins: min: 3.125 mid: 3.1875 max: 3.25 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -123,7 +123,7 @@ bins: min: 3.25 mid: 3.3125 max: 3.375 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -135,7 +135,7 @@ bins: min: 3.375 mid: 3.4375 max: 3.5 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -147,7 +147,7 @@ bins: min: 3.5 mid: 3.5625 max: 3.625 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -159,7 +159,7 @@ bins: min: 3.625 mid: 3.6875 max: 3.75 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -171,7 +171,7 @@ bins: min: 3.75 mid: 3.8125 max: 3.875 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -183,7 +183,7 @@ bins: min: 3.875 mid: 3.9375 max: 4.0 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -195,7 +195,7 @@ bins: min: 4.0 mid: 4.125 max: 4.25 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -207,7 +207,7 @@ bins: min: 2.0 mid: 2.125 max: 2.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -219,7 +219,7 @@ bins: min: 2.25 mid: 2.375 max: 2.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -231,7 +231,7 @@ bins: min: 2.5 mid: 2.625 max: 2.75 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -243,7 +243,7 @@ bins: min: 2.75 mid: 2.875 max: 3.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -255,7 +255,7 @@ bins: min: 3.0 mid: 3.125 max: 3.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -267,7 +267,7 @@ bins: min: 3.25 mid: 3.375 max: 3.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -279,7 +279,7 @@ bins: min: 3.5 mid: 3.75 max: 4.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -291,7 +291,7 @@ bins: min: 4.0 mid: 4.25 max: 4.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -303,7 +303,7 @@ bins: min: 2.0 mid: 2.125 max: 2.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -315,7 +315,7 @@ bins: min: 2.25 mid: 2.375 max: 2.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -327,7 +327,7 @@ bins: min: 2.5 mid: 2.625 max: 2.75 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -339,7 +339,7 @@ bins: min: 2.75 mid: 2.875 max: 3.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -351,7 +351,7 @@ bins: min: 3.0 mid: 3.125 max: 3.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -363,7 +363,7 @@ bins: min: 3.25 mid: 3.375 max: 3.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -375,7 +375,7 @@ bins: min: 3.5 mid: 3.75 max: 4.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -387,7 +387,7 @@ bins: min: 4.0 mid: 4.25 max: 4.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null diff --git a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/metadata.yaml index ef1ac34f73..4e12c57625 100644 --- a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_7TEV_MUON/metadata.yaml @@ -23,12 +23,12 @@ implemented_observables: description: "Inclusive cross-section for DY production (Z, W+/-) in bins of muon pseudorapidity" label: r"$d\sigma / d|y|$" units: "[fb]" - process_type: "EWK_RAP" + process_type: "DY_2L" tables: [1, 4] ndata: 33 npoints: [17, 16] plotting: - kinematics_override: ewk_rap_sqrt_scale + kinematics_override: identity dataset_label: "LHCb $W,Z \\to \\mu$ 8 TeV" plot_x: y y_label: '$d\sigma/dy$ (fb)' @@ -70,11 +70,11 @@ implemented_observables: "$W^-$", "$W^-$", ] - kinematic_coverage: [y, M2, sqrts] + kinematic_coverage: [y, m_V2, sqrts] kinematics: variables: y: {description: "Muon rapidity", label: "$y$", units: ""} - M2: {description: "W/Z boson Mass", label: "$M^2$", units: "$GeV^2$"} + m_V2: {description: "W/Z boson Mass", label: "$M^2$", units: "$GeV^2$"} sqrts: {description: "Center of Mass Energy", label: '$\sqrt{s}$', units: "$GeV$"} file: kinematics.yaml data_central: data.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/filter.py b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/filter.py index 27bcb46f5f..48fa84da7e 100644 --- a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/filter.py @@ -85,7 +85,7 @@ def get_kinematics(hepdata: dict, bin_index: list, boson: str = "Z") -> list: ymax = float(rapbins[bins]["high"]) kin_value = { "y": {"min": ymin, "mid": 0.5 * (ymin + ymax), "max": ymax}, - "M2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None}, + "m_V2": {"min": None, "mid": MAP_BOSON[boson] ** 2, "max": None}, "sqrts": {"min": None, "mid": SQRT_S, "max": None}, } kinematics.append(kin_value) diff --git a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/kinematics.yaml index 46155aa321..cc0d3659ef 100644 --- a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/kinematics.yaml @@ -3,7 +3,7 @@ bins: min: 2.0 mid: 2.0625 max: 2.125 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -15,7 +15,7 @@ bins: min: 2.125 mid: 2.1875 max: 2.25 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -27,7 +27,7 @@ bins: min: 2.25 mid: 2.3125 max: 2.375 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -39,7 +39,7 @@ bins: min: 2.375 mid: 2.4375 max: 2.5 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -51,7 +51,7 @@ bins: min: 2.5 mid: 2.5625 max: 2.625 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -63,7 +63,7 @@ bins: min: 2.625 mid: 2.6875 max: 2.75 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -75,7 +75,7 @@ bins: min: 2.75 mid: 2.8125 max: 2.875 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -87,7 +87,7 @@ bins: min: 2.875 mid: 2.9375 max: 3.0 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -99,7 +99,7 @@ bins: min: 3.0 mid: 3.0625 max: 3.125 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -111,7 +111,7 @@ bins: min: 3.125 mid: 3.1875 max: 3.25 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -123,7 +123,7 @@ bins: min: 3.25 mid: 3.3125 max: 3.375 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -135,7 +135,7 @@ bins: min: 3.375 mid: 3.4375 max: 3.5 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -147,7 +147,7 @@ bins: min: 3.5 mid: 3.5625 max: 3.625 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -159,7 +159,7 @@ bins: min: 3.625 mid: 3.6875 max: 3.75 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -171,7 +171,7 @@ bins: min: 3.75 mid: 3.8125 max: 3.875 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -183,7 +183,7 @@ bins: min: 3.875 mid: 3.9375 max: 4.0 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -195,7 +195,7 @@ bins: min: 4.0 mid: 4.125 max: 4.25 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -207,7 +207,7 @@ bins: min: 4.25 mid: 4.375 max: 4.5 - M2: + m_V2: min: null mid: 8.31517839e+03 max: null @@ -219,7 +219,7 @@ bins: min: 2.0 mid: 2.125 max: 2.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -231,7 +231,7 @@ bins: min: 2.25 mid: 2.375 max: 2.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -243,7 +243,7 @@ bins: min: 2.5 mid: 2.625 max: 2.75 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -255,7 +255,7 @@ bins: min: 2.75 mid: 2.875 max: 3.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -267,7 +267,7 @@ bins: min: 3.0 mid: 3.125 max: 3.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -279,7 +279,7 @@ bins: min: 3.25 mid: 3.375 max: 3.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -291,7 +291,7 @@ bins: min: 3.5 mid: 3.75 max: 4.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -303,7 +303,7 @@ bins: min: 4.0 mid: 4.25 max: 4.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -315,7 +315,7 @@ bins: min: 2.0 mid: 2.125 max: 2.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -327,7 +327,7 @@ bins: min: 2.25 mid: 2.375 max: 2.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -339,7 +339,7 @@ bins: min: 2.5 mid: 2.625 max: 2.75 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -351,7 +351,7 @@ bins: min: 2.75 mid: 2.875 max: 3.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -363,7 +363,7 @@ bins: min: 3.0 mid: 3.125 max: 3.25 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -375,7 +375,7 @@ bins: min: 3.25 mid: 3.375 max: 3.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -387,7 +387,7 @@ bins: min: 3.5 mid: 3.75 max: 4.0 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null @@ -399,7 +399,7 @@ bins: min: 4.0 mid: 4.25 max: 4.5 - M2: + m_V2: min: null mid: 6.46383840e+03 max: null diff --git a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/metadata.yaml index 5797ae1e7e..2b4d4ebe5f 100644 --- a/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/LHCB_DY_8TEV_MUON/metadata.yaml @@ -23,12 +23,12 @@ implemented_observables: description: "Inclusive cross-section for DY production (Z, W+/-) in bins of muon pseudorapidity at 8 TeV" label: r"$d\sigma / d|y|$" units: "[fb]" - process_type: "EWK_RAP" + process_type: "DY_2L" tables: [1, 2] ndata: 34 npoints: [16, 18] plotting: - kinematics_override: ewk_rap_sqrt_scale + kinematics_override: identity dataset_label: "LHCb $W,Z \\to \\mu$ 8 TeV" plot_x: y y_label: '$d\sigma/dy$ (fb)' @@ -71,11 +71,11 @@ implemented_observables: "$W^-$", "$W^-$", ] - kinematic_coverage: [y, M2, sqrts] + kinematic_coverage: [y, m_V2, sqrts] kinematics: variables: y: {description: "Muon rapidity", label: "$y$", units: ""} - M2: {description: "W/Z boson Mass", label: "$M^2$", units: "$GeV^2$"} + m_V2: {description: "W/Z boson Mass", label: "$M^2$", units: "$GeV^2$"} sqrts: {description: "Center of Mass Energy", label: '$\sqrt{s}$', units: "$GeV$"} file: kinematics.yaml data_central: data.yaml diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 9d6b87216f..11b5746d55 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -32,6 +32,7 @@ class _Vars: abs_eta = "abs_eta" m_W2 = "m_W2" m_Z2 = "m_Z2" + m_V2 = "m_V2" abs_eta_1 = "abs_eta_1" abs_eta_2 = "abs_eta_2" eta_1 = "eta_1" @@ -234,7 +235,7 @@ def _dyboson_xq2map(kin_info): Computes x and q2 mapping for pseudo rapidity observables originating from a W boson DY process. """ - mass2 = kin_info.get_one_of(_Vars.m_W2, _Vars.m_Z2) + mass2 = kin_info.get_one_of(_Vars.m_W2, _Vars.m_Z2, _Vars.m_V2) eta = kin_info.get_one_of(_Vars.eta, _Vars.y) sqrts = kin_info[_Vars.sqrts] @@ -369,7 +370,7 @@ def _dybosonptrap_xq2map(kin_info): DY_2L = _Process( "DY_2L", "DY W or Z -> 2 leptons ", - accepted_variables=(_Vars.y, _Vars.eta, _Vars.m_W2, _Vars.m_Z2, _Vars.sqrts), + accepted_variables=(_Vars.y, _Vars.eta, _Vars.m_W2, _Vars.m_Z2, _Vars.m_V2, _Vars.sqrts), xq2map_function=_dyboson_xq2map, ) @@ -384,7 +385,15 @@ def _dybosonptrap_xq2map(kin_info): DY_PT_RAP = _Process( "DY_PT", "DY W or Z (2 leptons) + j boson transverse momentum", - accepted_variables=(_Vars.pT, _Vars.m_W2, _Vars.m_Z2, _Vars.sqrts, _Vars.y, _Vars.eta, _Vars.m_ll2), + accepted_variables=( + _Vars.pT, + _Vars.m_W2, + _Vars.m_Z2, + _Vars.sqrts, + _Vars.y, + _Vars.eta, + _Vars.m_ll2, + ), xq2map_function=_dybosonptrap_xq2map, )