diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter_utils.py index 6b662669bf..ef0d2a2205 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter_utils.py @@ -19,17 +19,10 @@ def get_kinematics(): with open(hepdata_table, 'r') as file: input = yaml.safe_load(file) - y_values = [12.41, 22.57, 14.64, 6.73, 2.81, 1.27] - for i, M in enumerate(input["independent_variables"][0]['values']): kin_value = { - 'y': {'min': None, 'mid': y_values[i], 'max': None}, - 'M2': { - 'min': M['low'] ** 2, - 'mid': (0.5 * (M['low'] + M['high'])) ** 2, - 'max': M['high'] ** 2, - }, + 'm_ll': {'min': M['low'], 'mid': (0.5 * (M['low'] + M['high'])), 'max': M['high']}, 'sqrts': {'min': None, 'mid': 7000.0, 'max': None}, } diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics.yaml index 54cd594664..6fbaee161f 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics.yaml @@ -1,72 +1,48 @@ bins: -- y: - min: null - mid: 12.41 - max: null - M2: - min: 144.0 - mid: 210.25 - max: 289.0 +- m_ll: + min: 12.0 + mid: 14.5 + max: 17.0 sqrts: min: null mid: 7000.0 max: null -- y: - min: null - mid: 22.57 - max: null - M2: - min: 289.0 - mid: 380.25 - max: 484.0 +- m_ll: + min: 17.0 + mid: 19.5 + max: 22.0 sqrts: min: null mid: 7000.0 max: null -- y: - min: null - mid: 14.64 - max: null - M2: - min: 484.0 - mid: 625.0 - max: 784.0 +- m_ll: + min: 22.0 + mid: 25.0 + max: 28.0 sqrts: min: null mid: 7000.0 max: null -- y: - min: null - mid: 6.73 - max: null - M2: - min: 784.0 - mid: 1024.0 - max: 1296.0 +- m_ll: + min: 28.0 + mid: 32.0 + max: 36.0 sqrts: min: null mid: 7000.0 max: null -- y: - min: null - mid: 2.81 - max: null - M2: - min: 1296.0 - mid: 1681.0 - max: 2116.0 +- m_ll: + min: 36.0 + mid: 41.0 + max: 46.0 sqrts: min: null mid: 7000.0 max: null -- y: - min: null - mid: 1.27 - max: null - M2: - min: 2116.0 - mid: 3136.0 - max: 4356.0 +- m_ll: + min: 46.0 + mid: 56.0 + max: 66.0 sqrts: min: null mid: 7000.0 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml index 6339f96375..70b4df21d7 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml @@ -1,6 +1,6 @@ setname: ATLAS_Z0_7TEV_LOMASS version: 1 -version_comment: Port of old commondata +version_comment: "First implementation" nnpdf_metadata: nnpdf31_process: DY NC experiment: ATLAS @@ -18,34 +18,29 @@ implemented_observables: description: Drell-Yan Mass Distribution label: ATLAS low-mass DY 2011 units: '' - process_type: EWK_MLL + process_type: DY_MLL tables: [6] - npoints: [] + npoints: [6] ndata: 6 plotting: - kinematics_override: ewk_mll_sqrt_scale + kinematics_override: identity dataset_label: ATLAS low-mass DY 2011 y_label: $d\sigma_{Z/\gamma^{*}}/dM_{ll}$ (fb) - plot_x: k2 + plot_x: m_ll kinematic_coverage: - - k1 - - k2 - - k3 + - m_ll + - sqrts kinematics: variables: - k1: - description: Variable k1 - label: k1 - units: '' - k2: - description: Variable k2 - label: k2 - units: '' - k3: - description: Variable k3 - label: k3 - units: '' - file: kinematics_M.yaml + m_ll: + description: squared mass + label: m_ll + units: 'GeV' + sqrts: + description: center of mass energy + label: sqrts + units: 'GeV' + file: kinematics.yaml theory: conversion_factor: 1000.0 operation: 'null'