From db8d173ca4137a3c9a51e191c4afcda7d21f6910 Mon Sep 17 00:00:00 2001 From: Ella Cole Date: Tue, 15 Oct 2024 15:24:31 +0100 Subject: [PATCH 01/17] added rawdata to folder --- .../rawdata/ATLAS-49fb-Zhighmass.sys | 19 +++ .../HEPData-ins1234228-v1-Table_1.yaml | 137 ++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.sys create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/HEPData-ins1234228-v1-Table_1.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.sys b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.sys new file mode 100644 index 0000000000..11171ba3bb --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.sys @@ -0,0 +1,19 @@ +Born level +============================================================================================================ +mee mee Stat. Nbkg CDY Nbkg Reco. Id. Energy Unfolding Trigger MC Theoretical Lumi +xmin xmax stat. stat. scale&res modelling + GeV <-uncorrelated (%)-> <---------------------bin-to-bin correlated (%)---------------------> +============================================================================================================ +116 130 1.1 0.1 0.7 1.3 1.6 2.3 2.1 1.5 0.8 0.2 0.3 1.8 +130 150 1.4 0.2 0.7 1.8 1.6 2.3 1.7 1.5 0.8 0.5 0.2 1.8 +150 170 2.0 0.3 1.0 2.5 1.6 2.3 1.6 1.5 0.8 0.2 0.2 1.8 +170 190 2.7 0.4 1.3 2.8 1.6 2.3 1.0 1.5 0.8 0.2 0.2 1.8 +190 210 3.0 0.5 1.7 3.4 1.6 2.4 1.5 1.5 0.8 0.3 0.4 1.8 +210 230 4.4 0.9 2.0 4.1 1.6 2.4 2.0 1.5 0.8 0.8 0.5 1.8 +230 250 5.2 0.9 2.4 3.8 1.6 2.4 1.2 1.5 0.8 0.2 0.3 1.8 +250 300 4.3 0.7 0.9 4.1 1.6 2.4 1.7 1.5 0.8 0.2 0.2 1.8 +300 400 5.1 0.9 1.0 4.4 1.6 2.5 1.7 1.5 0.8 0.3 0.3 1.8 +400 500 9.4 2.0 0.9 4.0 1.6 2.6 2.3 1.5 0.8 0.5 0.4 1.8 +500 700 11 2.0 0.8 3.1 1.6 2.6 2.4 1.5 0.8 0.2 0.3 1.8 +700 1000 24 4.0 0.6 4.3 1.6 2.6 2.8 1.5 0.8 0.2 0.4 1.8 +1000 1500 50 7.6 0.4 3.1 1.7 2.5 3.3 1.5 0.8 0.3 0.4 1.8 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/HEPData-ins1234228-v1-Table_1.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/HEPData-ins1234228-v1-Table_1.yaml new file mode 100644 index 0000000000..b696003121 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/HEPData-ins1234228-v1-Table_1.yaml @@ -0,0 +1,137 @@ +dependent_variables: +- header: {name: D(SIG)/DM(EE), units: PB/GEV} + qualifiers: + - {name: ABS(ETARAP(EE)), value: < 2.5} + - {name: PT(C=E), units: GEV, value: '> 25'} + - {name: RE, value: P P --> E+ E- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + - {name: '', value: BORN} + values: + - errors: + - {label: stat, symerror: 1.1%} + - {label: sys, symerror: 4.2%} + value: 0.224 + - errors: + - {label: stat, symerror: 1.4%} + - {label: sys, symerror: 4.3%} + value: 0.102 + - errors: + - {label: stat, symerror: 2.0%} + - {label: sys, symerror: 4.6%} + value: 0.0512 + - errors: + - {label: stat, symerror: 2.7%} + - {label: sys, symerror: 4.7%} + value: 0.0284 + - errors: + - {label: stat, symerror: 3.0%} + - {label: sys, symerror: 5.3%} + value: 0.0187 + - errors: + - {label: stat, symerror: 4.4%} + - {label: sys, symerror: 6.1%} + value: 0.0107 + - errors: + - {label: stat, symerror: 5.2%} + - {label: sys, symerror: 5.9%} + value: 0.00823 + - errors: + - {label: stat, symerror: 4.3%} + - {label: sys, symerror: 5.8%} + value: 0.00466 + - errors: + - {label: stat, symerror: 5.1%} + - {label: sys, symerror: 5.9%} + value: 0.0017 + - errors: + - {label: stat, symerror: 9.4%} + - {label: sys, symerror: 6.3%} + value: 0.000474 + - errors: + - {label: stat, symerror: 11.0%} + - {label: sys, symerror: 5.7%} + value: 0.000146 + - errors: + - {label: stat, symerror: 24.0%} + - {label: sys, symerror: 7.5%} + value: 2.21e-05 + - errors: + - {label: stat, symerror: 50.0%} + - {label: sys, symerror: 9.8%} + value: 2.88e-06 +- header: {name: D(SIG)/DM(EE), units: PB/GEV} + qualifiers: + - {name: ABS(ETARAP(EE)), value: < 2.5} + - {name: PT(C=E), units: GEV, value: '> 25'} + - {name: RE, value: P P --> E+ E- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + - {name: '', value: DRESSED} + values: + - errors: + - {label: stat, symerror: 1.1%} + - {label: sys, symerror: 4.2%} + value: 0.215 + - errors: + - {label: stat, symerror: 1.4%} + - {label: sys, symerror: 4.3%} + value: 0.0984 + - errors: + - {label: stat, symerror: 2.0%} + - {label: sys, symerror: 4.6%} + value: 0.0493 + - errors: + - {label: stat, symerror: 2.7%} + - {label: sys, symerror: 4.7%} + value: 0.0276 + - errors: + - {label: stat, symerror: 3.0%} + - {label: sys, symerror: 5.3%} + value: 0.0182 + - errors: + - {label: stat, symerror: 4.4%} + - {label: sys, symerror: 6.1%} + value: 0.0104 + - errors: + - {label: stat, symerror: 5.2%} + - {label: sys, symerror: 5.9%} + value: 0.00798 + - errors: + - {label: stat, symerror: 4.3%} + - {label: sys, symerror: 5.8%} + value: 0.00452 + - errors: + - {label: stat, symerror: 5.1%} + - {label: sys, symerror: 5.9%} + value: 0.00165 + - errors: + - {label: stat, symerror: 9.4%} + - {label: sys, symerror: 6.3%} + value: 0.000458 + - errors: + - {label: stat, symerror: 11.0%} + - {label: sys, symerror: 5.7%} + value: 0.000141 + - errors: + - {label: stat, symerror: 24.0%} + - {label: sys, symerror: 7.5%} + value: 2.13e-05 + - errors: + - {label: stat, symerror: 50.0%} + - {label: sys, symerror: 9.8%} + value: 2.76e-06 +independent_variables: +- header: {name: M(EE), units: GEV} + values: + - {high: 130.0, low: 116.0} + - {high: 150.0, low: 130.0} + - {high: 170.0, low: 150.0} + - {high: 190.0, low: 170.0} + - {high: 210.0, low: 190.0} + - {high: 230.0, low: 210.0} + - {high: 250.0, low: 230.0} + - {high: 300.0, low: 250.0} + - {high: 400.0, low: 300.0} + - {high: 500.0, low: 400.0} + - {high: 700.0, low: 500.0} + - {high: 1000.0, low: 700.0} + - {high: 1500.0, low: 1000.0} From 74be7cb10126631b6e1030aa04bb7f1aaa39061e Mon Sep 17 00:00:00 2001 From: ecole41 Date: Wed, 16 Oct 2024 10:24:27 +0100 Subject: [PATCH 02/17] Added filter scripts --- .../commondata/ATLAS_Z0_7TEV_49FB/data.yaml | 14 +++++++++ .../commondata/ATLAS_Z0_7TEV_49FB/filter.py | 25 +++++++++++++++ .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 31 +++++++++++++++++++ .../ATLAS_Z0_7TEV_49FB/metadata.yaml | 6 ++-- 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml new file mode 100644 index 0000000000..16a0ad0e84 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml @@ -0,0 +1,14 @@ +data_central: +- 224.0 +- 102.0 +- 51.2 +- 28.400000000000002 +- 18.700000000000003 +- 10.7 +- 8.229999999999999 +- 4.66 +- 1.7 +- 0.474 +- 0.146 +- 0.022099999999999998 +- 0.0028799999999999997 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py new file mode 100644 index 0000000000..442eea2641 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py @@ -0,0 +1,25 @@ +""" +filter.py module for ATLAS_Z0_7TEV_49FB dataset +When running `python filter.py` the relevant data yaml +file will be created in the `nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS` directory. +""" + +import yaml +from filter_utils import get_data_values + + +def filter_ATLAS_Z0_7TEV_49FB_data_central(): + """ + This function writes the central values to yaml files. + """ + central_values = list(get_data_values()) + + data_central_yaml = {"data_central": central_values} + + # write central values and kinematics to yaml file + with open("data.yaml", "w") as file: + yaml.dump(data_central_yaml, file, sort_keys=False) + + +if __name__ == "__main__": + filter_ATLAS_Z0_7TEV_49FB_data_central() diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py new file mode 100644 index 0000000000..77bb360da5 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -0,0 +1,31 @@ +""" +This module contains helper functions that are used to extract the uncertainties, kinematics and data values +from the rawdata files. +""" + +import yaml + + +def get_data_values(): + """ + returns the central data values in the form of a list. + """ + + data_central = [] + + hepdata_table = f"rawdata/HEPData-ins1234228-v1-Table_1.yaml" + + with open(hepdata_table, 'r') as file: + input = yaml.safe_load(file) + + values = input['dependent_variables'][0]['values'] + + for value in values: + # store data central and convert the units + data_central.append(value['value'] * 1000) + + return data_central + + +if __name__ == "__main__": + get_data_values() diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index 8ea136e9dc..a0a553a40f 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -8,9 +8,9 @@ arXiv: url: https://arxiv.org/abs/1305.4192 journal: Phys.Lett. B725 (2013) 223 iNSPIRE: - url: '' + url: 'https://inspirehep.net/literature/1234228' hepdata: - url: 10.17182/hepdata.61422.v1/t1 + url: https://www.hepdata.net/record/ins1234228 version: -1 implemented_observables: - observable_name: HIMASS @@ -19,7 +19,7 @@ implemented_observables: label: ATLAS HM DY 7 TeV units: '' process_type: EWK_MLL - tables: [] + tables: [1] npoints: [] ndata: 13 plotting: From 37624d485555f65a5acad7522f4937890eac34db Mon Sep 17 00:00:00 2001 From: ecole41 Date: Thu, 17 Oct 2024 14:47:40 +0100 Subject: [PATCH 03/17] Added kinematics to filter --- .../commondata/ATLAS_Z0_7TEV_49FB/filter.py | 13 +++- .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 59 ++++++++++++++++++- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py index 442eea2641..45919472c1 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py @@ -5,21 +5,28 @@ """ import yaml -from filter_utils import get_data_values +from filter_utils import get_data_values, get_kinematics -def filter_ATLAS_Z0_7TEV_49FB_data_central(): +def filter_ATLAS_Z0_7TEV_49FB_data_kinetic(): """ This function writes the central values to yaml files. """ central_values = list(get_data_values()) + kin = get_kinematics() + data_central_yaml = {"data_central": central_values} + kinematics_yaml = {"bins": kin} + # write central values and kinematics to yaml file with open("data.yaml", "w") as file: yaml.dump(data_central_yaml, file, sort_keys=False) + with open("kinematics.yaml", "w") as file: + yaml.dump(kinematics_yaml, file, sort_keys=False) + if __name__ == "__main__": - filter_ATLAS_Z0_7TEV_49FB_data_central() + filter_ATLAS_Z0_7TEV_49FB_data_kinetic() diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py index 77bb360da5..4a87dd6b29 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -1,5 +1,5 @@ """ -This module contains helper functions that are used to extract the uncertainties, kinematics and data values +This module contains helper functions that are used to extract the data values from the rawdata files. """ @@ -27,5 +27,62 @@ def get_data_values(): return data_central +def get_kinematics(): + """ + returns the kinematics in the form of a list of dictionaries. + """ + kin = [] + + hepdata_table = f"rawdata/HEPData-ins1234228-v1-Table_1.yaml" + + with open(hepdata_table, 'r') as file: + input = yaml.safe_load(file) + + for i, M in enumerate(input["independent_variables"][0]['values']): + + kin_value = { + 'y': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, # y~M(EE)? + 'M2': { + 'min': M['low'] ** 2, + 'mid': (0.5 * (M['low'] + M['high'])) ** 2, + 'max': M['high'] ** 2, + }, + 'sqrts': {'min': None, 'mid': 7000.0, 'max': None}, + } + + kin.append(kin_value) + + return kin + + +def get_systematics_dataframe(): + """ + returns the absolute systematic uncertainties in the form of a pandas dataframe. + """ + sys_rawdata_path = "rawdata/ATLAS-49fb-Zhighmass.sys" + + df = pd.read_csv(sys_rawdata_path) + data_central = np.array(get_data_values()) + + # convert (MULT) percentage unc to absolute unc + abs_unc_df = (df.T[3:] * data_central).T / 100 + + return abs_unc_df + + +def get_systematics(): + """ """ + abs_unc_df = get_systematics_dataframe() + + uncertainties = [] + + for i, unc_dp in enumerate(abs_unc_df.values.T): + name = f"{abs_unc_df.columns[i]}" + values = [unc_dp[j] for j in range(len(unc_dp))] + uncertainties.append([{"name": name, "values": values}]) + + return uncertainties + + if __name__ == "__main__": get_data_values() From 59ad92c67c4e782f1484c5e1d728f744b4109d09 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Wed, 23 Oct 2024 14:13:55 +0100 Subject: [PATCH 04/17] Added systematics to filter and filter_utils --- .../commondata/ATLAS_Z0_7TEV_49FB/filter.py | 61 ++++++++++++++++++- .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 7 ++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py index 45919472c1..1c0de7dca1 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py @@ -5,7 +5,7 @@ """ import yaml -from filter_utils import get_data_values, get_kinematics +from filter_utils import get_data_values, get_kinematics, get_systematics def filter_ATLAS_Z0_7TEV_49FB_data_kinetic(): @@ -28,5 +28,64 @@ def filter_ATLAS_Z0_7TEV_49FB_data_kinetic(): yaml.dump(kinematics_yaml, file, sort_keys=False) +def filter_ATLAS_Z0_7TEV_49FB_systematics(): + """ + This function writes the systematics to a yaml file. + """ + + with open("metadata.yaml", "r") as file: + metadata = yaml.safe_load(file) + + systematics = get_systematics() + + # error definition + error_definitions = {} + errors = [] + + for sys in systematics: + if sys[0]['name'] == 'Stat': + error_definitions[sys[0]['name']] = { + "description": f"{sys[0]['name']}", + "treatment": "ADD", + "type": "UNCORR", + } + + elif (sys[0]['name'] == 'Nbkg_stat') or (sys[0]['name'] == 'CDY_stat'): + error_definitions[sys[0]['name']] = { + "description": f"{sys[0]['name']}", + "treatment": "MULT", + "type": "UNCORR", + } + + elif sys[0]['name'] == 'Lumi': + error_definitions[sys[0]['name']] = { + "description": f"{sys[0]['name']}", + "treatment": "MULT", + "type": "ATLASLUMI11", + } + + else: + error_definitions[sys[0]['name']] = { + "description": f"{sys[0]['name']}", + "treatment": "MULT", + "type": "CORR", + } + + for i in range(metadata['implemented_observables'][0]['ndata']): + error_value = {} + + for sys in systematics: + error_value[sys[0]['name']] = float(sys[0]['values'][i]) + + errors.append(error_value) + + uncertainties_yaml = {"definitions": error_definitions, "bins": errors} + + # write uncertainties + with open(f"uncertainties.yaml", 'w') as file: + yaml.dump(uncertainties_yaml, file, sort_keys=False) + + if __name__ == "__main__": filter_ATLAS_Z0_7TEV_49FB_data_kinetic() + filter_ATLAS_Z0_7TEV_49FB_systematics() diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py index 4a87dd6b29..77dc9a57c3 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -4,6 +4,8 @@ """ import yaml +import pandas as pd +import numpy as np def get_data_values(): @@ -59,13 +61,13 @@ def get_systematics_dataframe(): """ returns the absolute systematic uncertainties in the form of a pandas dataframe. """ - sys_rawdata_path = "rawdata/ATLAS-49fb-Zhighmass.sys" + sys_rawdata_path = "rawdata/ATLAS-49fb-Zhighmass.csv" df = pd.read_csv(sys_rawdata_path) data_central = np.array(get_data_values()) # convert (MULT) percentage unc to absolute unc - abs_unc_df = (df.T[3:] * data_central).T / 100 + abs_unc_df = (df.T[2:] * data_central).T / 100 return abs_unc_df @@ -86,3 +88,4 @@ def get_systematics(): if __name__ == "__main__": get_data_values() + get_systematics_dataframe() From f2726f5f9c5438bebc667c87fb37d6e5ad7c3bfb Mon Sep 17 00:00:00 2001 From: ecole41 Date: Wed, 23 Oct 2024 14:17:32 +0100 Subject: [PATCH 05/17] Added raw data csv file --- .../rawdata/ATLAS-49fb-Zhighmass.csv | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.csv diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.csv b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.csv new file mode 100644 index 0000000000..bb18e4d58f --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/rawdata/ATLAS-49fb-Zhighmass.csv @@ -0,0 +1,14 @@ +mee_xmin,mee_xmax,Stat,Nbkg_stat,CDY_stat,Nbkg,Reco,Id,Energy_scale_res,Unfolding,Trigger,MC_Modelling,Theoretical,Lumi +116,130,1.1,0.1,0.7,1.3,1.6,2.3,2.1,1.5,0.8,0.2,0.3,1.8 +130,150,1.4,0.2,0.7,1.8,1.6,2.3,1.7,1.5,0.8,0.5,0.2,1.8 +150,170,2.0,0.3,1.0,2.5,1.6,2.3,1.6,1.5,0.8,0.2,0.2,1.8 +170,190,2.7,0.4,1.3,2.8,1.6,2.3,1.0,1.5,0.8,0.2,0.2,1.8 +190,210,3.0,0.5,1.7,3.4,1.6,2.4,1.5,1.5,0.8,0.3,0.4,1.8 +210,230,4.4,0.9,2.0,4.1,1.6,2.4,2.0,1.5,0.8,0.8,0.5,1.8 +230,250,5.2,0.9,2.4,3.8,1.6,2.4,1.2,1.5,0.8,0.2,0.3,1.8 +250,300,4.3,0.7,0.9,4.1,1.6,2.4,1.7,1.5,0.8,0.2,0.2,1.8 +300,400,5.1,0.9,1.0,4.4,1.6,2.5,1.7,1.5,0.8,0.3,0.3,1.8 +400,500,9.4,2.0,0.9,4.0,1.6,2.6,2.3,1.5,0.8,0.5,0.4,1.8 +500,700,11,2.0,0.8,3.1,1.6,2.6,2.4,1.5,0.8,0.2,0.3,1.8 +700,1000,24,4.0,0.6,4.3,1.6,2.6,2.8,1.5,0.8,0.2,0.4,1.8 +1000,1500,50,7.6,0.4,3.1,1.7,2.5,3.3,1.5,0.8,0.3,0.4,1.8 From e049fd752c5f32fdc2657a67efdbfbc8d967cc97 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Wed, 23 Oct 2024 14:45:26 +0100 Subject: [PATCH 06/17] uncertainties.yaml added --- .../ATLAS_Z0_7TEV_49FB/uncertainties.yaml | 206 ++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml new file mode 100644 index 0000000000..3b75481b7a --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml @@ -0,0 +1,206 @@ +definitions: + Stat: + description: Stat + treatment: ADD + type: UNCORR + Nbkg_stat: + description: Nbkg_stat + treatment: MULT + type: UNCORR + CDY_stat: + description: CDY_stat + treatment: MULT + type: UNCORR + Nbkg: + description: Nbkg + treatment: MULT + type: CORR + Reco: + description: Reco + treatment: MULT + type: CORR + Id: + description: Id + treatment: MULT + type: CORR + Energy_scale_res: + description: Energy_scale_res + treatment: MULT + type: CORR + Unfolding: + description: Unfolding + treatment: MULT + type: CORR + Trigger: + description: Trigger + treatment: MULT + type: CORR + MC_Modelling: + description: MC_Modelling + treatment: MULT + type: CORR + Theoretical: + description: Theoretical + treatment: MULT + type: CORR + Lumi: + description: Lumi + treatment: MULT + type: ATLASLUMI11 +bins: +- Stat: 2.4640000000000004 + Nbkg_stat: 0.22400000000000003 + CDY_stat: 1.5679999999999998 + Nbkg: 2.912 + Reco: 3.5840000000000005 + Id: 5.151999999999999 + Energy_scale_res: 4.704000000000001 + Unfolding: 3.36 + Trigger: 1.7920000000000003 + MC_Modelling: 0.44800000000000006 + Theoretical: 0.672 + Lumi: 4.032 +- Stat: 1.428 + Nbkg_stat: 0.20400000000000001 + CDY_stat: 0.714 + Nbkg: 1.8359999999999999 + Reco: 1.6320000000000001 + Id: 2.346 + Energy_scale_res: 1.734 + Unfolding: 1.53 + Trigger: 0.8160000000000001 + MC_Modelling: 0.51 + Theoretical: 0.20400000000000001 + Lumi: 1.8359999999999999 +- Stat: 1.024 + Nbkg_stat: 0.1536 + CDY_stat: 0.512 + Nbkg: 1.28 + Reco: 0.8192000000000002 + Id: 1.1776 + Energy_scale_res: 0.8192000000000002 + Unfolding: 0.7680000000000001 + Trigger: 0.4096000000000001 + MC_Modelling: 0.10240000000000002 + Theoretical: 0.10240000000000002 + Lumi: 0.9216000000000001 +- Stat: 0.7668 + Nbkg_stat: 0.1136 + CDY_stat: 0.36920000000000003 + Nbkg: 0.7951999999999999 + Reco: 0.4544 + Id: 0.6531999999999999 + Energy_scale_res: 0.28400000000000003 + Unfolding: 0.426 + Trigger: 0.2272 + MC_Modelling: 0.0568 + Theoretical: 0.0568 + Lumi: 0.5112000000000001 +- Stat: 0.561 + Nbkg_stat: 0.09350000000000001 + CDY_stat: 0.3179 + Nbkg: 0.6358 + Reco: 0.2992000000000001 + Id: 0.44880000000000003 + Energy_scale_res: 0.2805 + Unfolding: 0.2805 + Trigger: 0.14960000000000004 + MC_Modelling: 0.056100000000000004 + Theoretical: 0.07480000000000002 + Lumi: 0.3366 +- Stat: 0.4708 + Nbkg_stat: 0.0963 + CDY_stat: 0.214 + Nbkg: 0.4386999999999999 + Reco: 0.17120000000000002 + Id: 0.2568 + Energy_scale_res: 0.214 + Unfolding: 0.16049999999999998 + Trigger: 0.08560000000000001 + MC_Modelling: 0.08560000000000001 + Theoretical: 0.0535 + Lumi: 0.1926 +- Stat: 0.4279599999999999 + Nbkg_stat: 0.07407 + CDY_stat: 0.19751999999999995 + Nbkg: 0.31273999999999996 + Reco: 0.13168 + Id: 0.19751999999999995 + Energy_scale_res: 0.09875999999999997 + Unfolding: 0.12344999999999999 + Trigger: 0.06584 + MC_Modelling: 0.01646 + Theoretical: 0.024689999999999993 + Lumi: 0.14814 +- Stat: 0.20038 + Nbkg_stat: 0.03262 + CDY_stat: 0.04194 + Nbkg: 0.19105999999999998 + Reco: 0.07456 + Id: 0.11184 + Energy_scale_res: 0.07922 + Unfolding: 0.0699 + Trigger: 0.03728 + MC_Modelling: 0.00932 + Theoretical: 0.00932 + Lumi: 0.08388 +- Stat: 0.0867 + Nbkg_stat: 0.015300000000000001 + CDY_stat: 0.017 + Nbkg: 0.0748 + Reco: 0.027200000000000002 + Id: 0.0425 + Energy_scale_res: 0.028899999999999995 + Unfolding: 0.0255 + Trigger: 0.013600000000000001 + MC_Modelling: 0.0051 + Theoretical: 0.0051 + Lumi: 0.030600000000000002 +- Stat: 0.044556 + Nbkg_stat: 0.009479999999999999 + CDY_stat: 0.004266 + Nbkg: 0.018959999999999998 + Reco: 0.007584 + Id: 0.012324 + Energy_scale_res: 0.010901999999999998 + Unfolding: 0.00711 + Trigger: 0.003792 + MC_Modelling: 0.0023699999999999997 + Theoretical: 0.001896 + Lumi: 0.008532 +- Stat: 0.016059999999999998 + Nbkg_stat: 0.00292 + CDY_stat: 0.001168 + Nbkg: 0.004526 + Reco: 0.002336 + Id: 0.003796 + Energy_scale_res: 0.0035039999999999997 + Unfolding: 0.0021899999999999997 + Trigger: 0.001168 + MC_Modelling: 0.000292 + Theoretical: 0.00043799999999999997 + Lumi: 0.0026279999999999997 +- Stat: 0.005304 + Nbkg_stat: 0.0008839999999999999 + CDY_stat: 0.0001326 + Nbkg: 0.0009502999999999998 + Reco: 0.0003536 + Id: 0.0005746 + Energy_scale_res: 0.0006187999999999999 + Unfolding: 0.0003315 + Trigger: 0.0001768 + MC_Modelling: 4.42e-05 + Theoretical: 8.84e-05 + Lumi: 0.00039779999999999997 +- Stat: 0.0014399999999999999 + Nbkg_stat: 0.00021887999999999996 + CDY_stat: 1.152e-05 + Nbkg: 8.928e-05 + Reco: 4.895999999999999e-05 + Id: 7.2e-05 + Energy_scale_res: 9.503999999999998e-05 + Unfolding: 4.319999999999999e-05 + Trigger: 2.304e-05 + MC_Modelling: 8.639999999999999e-06 + Theoretical: 1.152e-05 + Lumi: 5.183999999999999e-05 From bd4001490832f1844d735a06be20ff75d16a3006 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Fri, 8 Nov 2024 09:58:30 +0000 Subject: [PATCH 07/17] Added kinematics.yaml --- .../ATLAS_Z0_7TEV_49FB/kinematics.yaml | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml new file mode 100644 index 0000000000..aa89034126 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml @@ -0,0 +1,157 @@ +bins: +- y: + min: null + mid: 123.0 + max: null + M2: + min: 13456.0 + mid: 15129.0 + max: 16900.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 140.0 + max: null + M2: + min: 16900.0 + mid: 19600.0 + max: 22500.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 160.0 + max: null + M2: + min: 22500.0 + mid: 25600.0 + max: 28900.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 180.0 + max: null + M2: + min: 28900.0 + mid: 32400.0 + max: 36100.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 200.0 + max: null + M2: + min: 36100.0 + mid: 40000.0 + max: 44100.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 220.0 + max: null + M2: + min: 44100.0 + mid: 48400.0 + max: 52900.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 240.0 + max: null + M2: + min: 52900.0 + mid: 57600.0 + max: 62500.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 275.0 + max: null + M2: + min: 62500.0 + mid: 75625.0 + max: 90000.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 350.0 + max: null + M2: + min: 90000.0 + mid: 122500.0 + max: 160000.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 450.0 + max: null + M2: + min: 160000.0 + mid: 202500.0 + max: 250000.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 600.0 + max: null + M2: + min: 250000.0 + mid: 360000.0 + max: 490000.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 850.0 + max: null + M2: + min: 490000.0 + mid: 722500.0 + max: 1000000.0 + sqrts: + min: null + mid: 7000.0 + max: null +- y: + min: null + mid: 1250.0 + max: null + M2: + min: 1000000.0 + mid: 1562500.0 + max: 2250000.0 + sqrts: + min: null + mid: 7000.0 + max: null From f908f095c64e6e9a7c9eb216fe40aaafac60c813 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Wed, 13 Nov 2024 08:50:26 +0000 Subject: [PATCH 08/17] Edited metadata, still need completing, add prettify floats --- .../commondata/ATLAS_Z0_7TEV_49FB/data.yaml | 10 +- .../commondata/ATLAS_Z0_7TEV_49FB/filter.py | 3 + .../ATLAS_Z0_7TEV_49FB/kinematics.yaml | 8 +- .../ATLAS_Z0_7TEV_49FB/metadata.yaml | 37 ++-- .../ATLAS_Z0_7TEV_49FB/uncertainties.yaml | 158 +++++++++--------- 5 files changed, 110 insertions(+), 106 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml index 16a0ad0e84..d9b577a16a 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/data.yaml @@ -2,13 +2,13 @@ data_central: - 224.0 - 102.0 - 51.2 -- 28.400000000000002 -- 18.700000000000003 +- 2.84000000e+01 +- 1.87000000e+01 - 10.7 -- 8.229999999999999 +- 8.23000000e+00 - 4.66 - 1.7 - 0.474 - 0.146 -- 0.022099999999999998 -- 0.0028799999999999997 +- 2.21000000e-02 +- 2.88000000e-03 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py index 1c0de7dca1..a1ea470b6e 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter.py @@ -6,6 +6,9 @@ import yaml from filter_utils import get_data_values, get_kinematics, get_systematics +from nnpdf_data.filter_utils.utils import prettify_float + +yaml.add_representer(float, prettify_float) def filter_ATLAS_Z0_7TEV_49FB_data_kinetic(): diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml index aa89034126..1d97c85c17 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml @@ -138,7 +138,7 @@ bins: M2: min: 490000.0 mid: 722500.0 - max: 1000000.0 + max: 1.00000000e+06 sqrts: min: null mid: 7000.0 @@ -148,9 +148,9 @@ bins: mid: 1250.0 max: null M2: - min: 1000000.0 - mid: 1562500.0 - max: 2250000.0 + min: 1.00000000e+06 + mid: 1.56250000e+06 + max: 2.25000000e+06 sqrts: min: null mid: 7000.0 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index a0a553a40f..ba6f7b22e9 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -1,6 +1,6 @@ setname: ATLAS_Z0_7TEV_49FB version: 1 -version_comment: Port of old commondata +version_comment: Port of old commondata #? nnpdf_metadata: nnpdf31_process: DY NC experiment: ATLAS @@ -18,44 +18,45 @@ implemented_observables: description: Drell-Yan Mass Distribution label: ATLAS HM DY 7 TeV units: '' - process_type: EWK_MLL + process_type: DY_Z_Y tables: [1] npoints: [] ndata: 13 plotting: - kinematics_override: ewk_mll_sqrt_scale + kinematics_override: identity dataset_label: ATLAS HM DY 7 TeV y_label: $d\sigma_{Z/\gamma^{*}}/dM_{ll}$ (fb) y_scale: log plot_x: k2 kinematic_coverage: - - k1 - - k2 - - k3 + - y + - M2 + - SQRT(S) kinematics: variables: k1: - description: Variable k1 - label: k1 - units: '' + description: Rapidity #of Z boson? + label: y + units: '' #GeV? k2: - description: Variable k2 - label: k2 - units: '' + description: Squared mass of electron pair + label: M2 + units: '' #GeV^2? k3: - description: Variable k3 - label: k3 - units: '' - file: kinematics_HIMASS.yaml + description: Square root of center of mass energy + label: SQRT(S) + units: '' #GeV? + file: kinematics.yaml theory: conversion_factor: 1000.0 operation: 'null' FK_tables: - - ATLAS_DY_7TEV_49FB_HIMASS - data_uncertainties: [] + data_uncertainties: + - uncertatinties.yaml variants: legacy: data_uncertainties: - uncertainties_legacy_HIMASS.yaml - data_central: data_legacy_HIMASS.yaml + data_central: data.yaml ported_from: ATLASZHIGHMASS49FB diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml index 3b75481b7a..1c58b9975c 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/uncertainties.yaml @@ -48,94 +48,94 @@ definitions: treatment: MULT type: ATLASLUMI11 bins: -- Stat: 2.4640000000000004 - Nbkg_stat: 0.22400000000000003 - CDY_stat: 1.5679999999999998 +- Stat: 2.46400000e+00 + Nbkg_stat: 2.24000000e-01 + CDY_stat: 1.56800000e+00 Nbkg: 2.912 - Reco: 3.5840000000000005 - Id: 5.151999999999999 - Energy_scale_res: 4.704000000000001 + Reco: 3.58400000e+00 + Id: 5.15200000e+00 + Energy_scale_res: 4.70400000e+00 Unfolding: 3.36 - Trigger: 1.7920000000000003 - MC_Modelling: 0.44800000000000006 + Trigger: 1.79200000e+00 + MC_Modelling: 4.48000000e-01 Theoretical: 0.672 Lumi: 4.032 - Stat: 1.428 - Nbkg_stat: 0.20400000000000001 + Nbkg_stat: 2.04000000e-01 CDY_stat: 0.714 - Nbkg: 1.8359999999999999 - Reco: 1.6320000000000001 + Nbkg: 1.83600000e+00 + Reco: 1.63200000e+00 Id: 2.346 Energy_scale_res: 1.734 Unfolding: 1.53 - Trigger: 0.8160000000000001 + Trigger: 8.16000000e-01 MC_Modelling: 0.51 - Theoretical: 0.20400000000000001 - Lumi: 1.8359999999999999 + Theoretical: 2.04000000e-01 + Lumi: 1.83600000e+00 - Stat: 1.024 Nbkg_stat: 0.1536 CDY_stat: 0.512 Nbkg: 1.28 - Reco: 0.8192000000000002 + Reco: 8.19200000e-01 Id: 1.1776 - Energy_scale_res: 0.8192000000000002 - Unfolding: 0.7680000000000001 - Trigger: 0.4096000000000001 - MC_Modelling: 0.10240000000000002 - Theoretical: 0.10240000000000002 - Lumi: 0.9216000000000001 + Energy_scale_res: 8.19200000e-01 + Unfolding: 7.68000000e-01 + Trigger: 4.09600000e-01 + MC_Modelling: 1.02400000e-01 + Theoretical: 1.02400000e-01 + Lumi: 9.21600000e-01 - Stat: 0.7668 Nbkg_stat: 0.1136 - CDY_stat: 0.36920000000000003 - Nbkg: 0.7951999999999999 + CDY_stat: 3.69200000e-01 + Nbkg: 7.95200000e-01 Reco: 0.4544 - Id: 0.6531999999999999 - Energy_scale_res: 0.28400000000000003 + Id: 6.53200000e-01 + Energy_scale_res: 2.84000000e-01 Unfolding: 0.426 Trigger: 0.2272 MC_Modelling: 0.0568 Theoretical: 0.0568 - Lumi: 0.5112000000000001 + Lumi: 5.11200000e-01 - Stat: 0.561 - Nbkg_stat: 0.09350000000000001 + Nbkg_stat: 9.35000000e-02 CDY_stat: 0.3179 Nbkg: 0.6358 - Reco: 0.2992000000000001 - Id: 0.44880000000000003 + Reco: 2.99200000e-01 + Id: 4.48800000e-01 Energy_scale_res: 0.2805 Unfolding: 0.2805 - Trigger: 0.14960000000000004 - MC_Modelling: 0.056100000000000004 - Theoretical: 0.07480000000000002 + Trigger: 1.49600000e-01 + MC_Modelling: 5.61000000e-02 + Theoretical: 7.48000000e-02 Lumi: 0.3366 - Stat: 0.4708 Nbkg_stat: 0.0963 CDY_stat: 0.214 - Nbkg: 0.4386999999999999 - Reco: 0.17120000000000002 + Nbkg: 4.38700000e-01 + Reco: 1.71200000e-01 Id: 0.2568 Energy_scale_res: 0.214 - Unfolding: 0.16049999999999998 - Trigger: 0.08560000000000001 - MC_Modelling: 0.08560000000000001 + Unfolding: 1.60500000e-01 + Trigger: 8.56000000e-02 + MC_Modelling: 8.56000000e-02 Theoretical: 0.0535 Lumi: 0.1926 -- Stat: 0.4279599999999999 +- Stat: 4.27960000e-01 Nbkg_stat: 0.07407 - CDY_stat: 0.19751999999999995 - Nbkg: 0.31273999999999996 + CDY_stat: 1.97520000e-01 + Nbkg: 3.12740000e-01 Reco: 0.13168 - Id: 0.19751999999999995 - Energy_scale_res: 0.09875999999999997 - Unfolding: 0.12344999999999999 + Id: 1.97520000e-01 + Energy_scale_res: 9.87600000e-02 + Unfolding: 1.23450000e-01 Trigger: 0.06584 MC_Modelling: 0.01646 - Theoretical: 0.024689999999999993 + Theoretical: 2.46900000e-02 Lumi: 0.14814 - Stat: 0.20038 Nbkg_stat: 0.03262 CDY_stat: 0.04194 - Nbkg: 0.19105999999999998 + Nbkg: 1.91060000e-01 Reco: 0.07456 Id: 0.11184 Energy_scale_res: 0.07922 @@ -145,62 +145,62 @@ bins: Theoretical: 0.00932 Lumi: 0.08388 - Stat: 0.0867 - Nbkg_stat: 0.015300000000000001 + Nbkg_stat: 1.53000000e-02 CDY_stat: 0.017 Nbkg: 0.0748 - Reco: 0.027200000000000002 + Reco: 2.72000000e-02 Id: 0.0425 - Energy_scale_res: 0.028899999999999995 + Energy_scale_res: 2.89000000e-02 Unfolding: 0.0255 - Trigger: 0.013600000000000001 + Trigger: 1.36000000e-02 MC_Modelling: 0.0051 Theoretical: 0.0051 - Lumi: 0.030600000000000002 + Lumi: 3.06000000e-02 - Stat: 0.044556 - Nbkg_stat: 0.009479999999999999 + Nbkg_stat: 9.48000000e-03 CDY_stat: 0.004266 - Nbkg: 0.018959999999999998 + Nbkg: 1.89600000e-02 Reco: 0.007584 Id: 0.012324 - Energy_scale_res: 0.010901999999999998 + Energy_scale_res: 1.09020000e-02 Unfolding: 0.00711 Trigger: 0.003792 - MC_Modelling: 0.0023699999999999997 + MC_Modelling: 2.37000000e-03 Theoretical: 0.001896 Lumi: 0.008532 -- Stat: 0.016059999999999998 +- Stat: 1.60600000e-02 Nbkg_stat: 0.00292 CDY_stat: 0.001168 Nbkg: 0.004526 Reco: 0.002336 Id: 0.003796 - Energy_scale_res: 0.0035039999999999997 - Unfolding: 0.0021899999999999997 + Energy_scale_res: 3.50400000e-03 + Unfolding: 2.19000000e-03 Trigger: 0.001168 MC_Modelling: 0.000292 - Theoretical: 0.00043799999999999997 - Lumi: 0.0026279999999999997 + Theoretical: 4.38000000e-04 + Lumi: 2.62800000e-03 - Stat: 0.005304 - Nbkg_stat: 0.0008839999999999999 - CDY_stat: 0.0001326 - Nbkg: 0.0009502999999999998 - Reco: 0.0003536 - Id: 0.0005746 - Energy_scale_res: 0.0006187999999999999 - Unfolding: 0.0003315 - Trigger: 0.0001768 + Nbkg_stat: 8.84000000e-04 + CDY_stat: 1.32600000e-04 + Nbkg: 9.50300000e-04 + Reco: 3.53600000e-04 + Id: 5.74600000e-04 + Energy_scale_res: 6.18800000e-04 + Unfolding: 3.31500000e-04 + Trigger: 1.76800000e-04 MC_Modelling: 4.42e-05 Theoretical: 8.84e-05 - Lumi: 0.00039779999999999997 -- Stat: 0.0014399999999999999 - Nbkg_stat: 0.00021887999999999996 - CDY_stat: 1.152e-05 - Nbkg: 8.928e-05 - Reco: 4.895999999999999e-05 + Lumi: 3.97800000e-04 +- Stat: 1.44000000e-03 + Nbkg_stat: 2.18880000e-04 + CDY_stat: 1.15200000e-05 + Nbkg: 8.92800000e-05 + Reco: 4.89600000e-05 Id: 7.2e-05 - Energy_scale_res: 9.503999999999998e-05 - Unfolding: 4.319999999999999e-05 - Trigger: 2.304e-05 - MC_Modelling: 8.639999999999999e-06 - Theoretical: 1.152e-05 - Lumi: 5.183999999999999e-05 + Energy_scale_res: 9.50400000e-05 + Unfolding: 4.32000000e-05 + Trigger: 2.30400000e-05 + MC_Modelling: 8.64000000e-06 + Theoretical: 1.15200000e-05 + Lumi: 5.18400000e-05 From 29dc2ea180863e87fa220c46c5c12b3b3d400ea6 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Mon, 18 Nov 2024 09:52:11 +0000 Subject: [PATCH 09/17] removed m_ll2 kinematic, added DY_MLL process to process_options.py and m_ll class, edited metadata --- .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 7 +- .../ATLAS_Z0_7TEV_49FB/kinematics.yaml | 78 ++++--------------- .../ATLAS_Z0_7TEV_49FB/metadata.yaml | 32 +++----- validphys2/src/validphys/process_options.py | 22 ++++++ 4 files changed, 48 insertions(+), 91 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py index 77dc9a57c3..3d2741f192 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -43,12 +43,7 @@ def get_kinematics(): for i, M in enumerate(input["independent_variables"][0]['values']): kin_value = { - 'y': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, # y~M(EE)? - 'M2': { - 'min': M['low'] ** 2, - 'mid': (0.5 * (M['low'] + M['high'])) ** 2, - 'max': M['high'] ** 2, - }, + 'm_ll': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, 'sqrts': {'min': None, 'mid': 7000.0, 'max': None}, } diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml index 1d97c85c17..b5603e5c65 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml @@ -1,156 +1,104 @@ bins: -- y: +- m_ll: min: null mid: 123.0 max: null - M2: - min: 13456.0 - mid: 15129.0 - max: 16900.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 140.0 max: null - M2: - min: 16900.0 - mid: 19600.0 - max: 22500.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 160.0 max: null - M2: - min: 22500.0 - mid: 25600.0 - max: 28900.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 180.0 max: null - M2: - min: 28900.0 - mid: 32400.0 - max: 36100.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 200.0 max: null - M2: - min: 36100.0 - mid: 40000.0 - max: 44100.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 220.0 max: null - M2: - min: 44100.0 - mid: 48400.0 - max: 52900.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 240.0 max: null - M2: - min: 52900.0 - mid: 57600.0 - max: 62500.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 275.0 max: null - M2: - min: 62500.0 - mid: 75625.0 - max: 90000.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 350.0 max: null - M2: - min: 90000.0 - mid: 122500.0 - max: 160000.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 450.0 max: null - M2: - min: 160000.0 - mid: 202500.0 - max: 250000.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 600.0 max: null - M2: - min: 250000.0 - mid: 360000.0 - max: 490000.0 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 850.0 max: null - M2: - min: 490000.0 - mid: 722500.0 - max: 1.00000000e+06 sqrts: min: null mid: 7000.0 max: null -- y: +- m_ll: min: null mid: 1250.0 max: null - M2: - min: 1.00000000e+06 - mid: 1.56250000e+06 - max: 2.25000000e+06 sqrts: min: null mid: 7000.0 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index ba6f7b22e9..1bfcd15648 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -1,6 +1,6 @@ setname: ATLAS_Z0_7TEV_49FB version: 1 -version_comment: Port of old commondata #? +version_comment: Reimplementation of old commondata nnpdf_metadata: nnpdf31_process: DY NC experiment: ATLAS @@ -18,7 +18,7 @@ implemented_observables: description: Drell-Yan Mass Distribution label: ATLAS HM DY 7 TeV units: '' - process_type: DY_Z_Y + process_type: DY_MLL tables: [1] npoints: [] ndata: 13 @@ -27,25 +27,21 @@ implemented_observables: dataset_label: ATLAS HM DY 7 TeV y_label: $d\sigma_{Z/\gamma^{*}}/dM_{ll}$ (fb) y_scale: log - plot_x: k2 + plot_x: k2 #Should this be changed? kinematic_coverage: - - y - - M2 - - SQRT(S) + - m_ll + - sqrts kinematics: variables: k1: - description: Rapidity #of Z boson? - label: y - units: '' #GeV? + description: Mass of lepton pair + label: m_ll + units: 'GeV' k2: - description: Squared mass of electron pair - label: M2 - units: '' #GeV^2? - k3: - description: Square root of center of mass energy - label: SQRT(S) - units: '' #GeV? + description: Square root of centre of mass energy + label: sqrts + units: 'GeV' + file: kinematics.yaml theory: conversion_factor: 1000.0 @@ -54,9 +50,5 @@ implemented_observables: - - ATLAS_DY_7TEV_49FB_HIMASS data_uncertainties: - uncertatinties.yaml - variants: - legacy: - data_uncertainties: - - uncertainties_legacy_HIMASS.yaml data_central: data.yaml ported_from: ATLASZHIGHMASS49FB diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index ec3cd7da5c..825195ec09 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -36,6 +36,7 @@ class _Vars: abs_eta_2 = "abs_eta_2" eta_1 = "eta_1" eta_2 = "eta_2" + m_ll = "m_ll" class _KinematicsInformation: @@ -256,6 +257,20 @@ def _dybosonpt_xq2map(kin_dict): return x, ET2 +def _dymll_xq2map(kin_info): + """ + Computes x and q2 mapping for DY Z -> 2 leptons mass. + Here we calculate m_ll^2 and sqrt(s). + """ + + m_ll = kin_info.get_one_of(_Vars.m_ll) + sqrts = kin_info.get_one_of(_Vars.sqrts) + m_ll2 = m_ll**2 + x = np.sqrt(m_ll) / sqrts + + return x, m_ll2 + + DIS = _Process( "DIS", "Deep Inelastic Scattering", @@ -355,6 +370,12 @@ def _dybosonpt_xq2map(kin_dict): xq2map_function=_dyboson_xq2map, ) +DY_MLL = _Process( + "DY_MLL", + "DY Z -> ll mass of lepton pair", + accepted_variables=(_Vars.m_ll, _Vars.sqrts), + xq2map_function=_dymll_xq2map, +) DY_PT = _Process( "DY_PT", @@ -389,6 +410,7 @@ def _dybosonpt_xq2map(kin_dict): "JET_POL": JET_POL, "DIJET_POL": DIJET_POL, "DY_Z_Y": dataclasses.replace(DY_2L, name="DY_Z_Y", description="DY Z -> ll (pseudo)rapidity"), + "DY_MLL": DY_MLL, "DY_W_ETA": dataclasses.replace( DY_2L, name="DY_W_ETA", description="DY W -> l nu (pseudo)rapidity" ), From 40f83455d289b3015d1896c97e134b886180090b Mon Sep 17 00:00:00 2001 From: ecole41 Date: Mon, 25 Nov 2024 10:38:34 +0000 Subject: [PATCH 10/17] Changed m_ll to M_ll to stop filtering error in vp --- .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 2 +- .../ATLAS_Z0_7TEV_49FB/kinematics.yaml | 26 +++++++++---------- .../ATLAS_Z0_7TEV_49FB/metadata.yaml | 12 ++++----- validphys2/src/validphys/process_options.py | 14 +++++----- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py index 3d2741f192..298ec110c5 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -43,7 +43,7 @@ def get_kinematics(): for i, M in enumerate(input["independent_variables"][0]['values']): kin_value = { - 'm_ll': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, + 'M_ll': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, 'sqrts': {'min': None, 'mid': 7000.0, 'max': None}, } diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml index b5603e5c65..e556307c26 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml @@ -1,5 +1,5 @@ bins: -- m_ll: +- M_ll: min: null mid: 123.0 max: null @@ -7,7 +7,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 140.0 max: null @@ -15,7 +15,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 160.0 max: null @@ -23,7 +23,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 180.0 max: null @@ -31,7 +31,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 200.0 max: null @@ -39,7 +39,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 220.0 max: null @@ -47,7 +47,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 240.0 max: null @@ -55,7 +55,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 275.0 max: null @@ -63,7 +63,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 350.0 max: null @@ -71,7 +71,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 450.0 max: null @@ -79,7 +79,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 600.0 max: null @@ -87,7 +87,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 850.0 max: null @@ -95,7 +95,7 @@ bins: min: null mid: 7000.0 max: null -- m_ll: +- M_ll: min: null mid: 1250.0 max: null diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index 1bfcd15648..e31b940585 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -27,17 +27,17 @@ implemented_observables: dataset_label: ATLAS HM DY 7 TeV y_label: $d\sigma_{Z/\gamma^{*}}/dM_{ll}$ (fb) y_scale: log - plot_x: k2 #Should this be changed? + plot_x: M_ll #Not sure how to change this to M_ll2 kinematic_coverage: - - m_ll + - M_ll - sqrts kinematics: variables: - k1: + M_ll: description: Mass of lepton pair - label: m_ll + label: M_ll units: 'GeV' - k2: + sqrts: description: Square root of centre of mass energy label: sqrts units: 'GeV' @@ -49,6 +49,6 @@ implemented_observables: FK_tables: - - ATLAS_DY_7TEV_49FB_HIMASS data_uncertainties: - - uncertatinties.yaml + - uncertainties.yaml data_central: data.yaml ported_from: ATLASZHIGHMASS49FB diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 825195ec09..413ed7678a 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -36,7 +36,7 @@ class _Vars: abs_eta_2 = "abs_eta_2" eta_1 = "eta_1" eta_2 = "eta_2" - m_ll = "m_ll" + M_ll = "M_ll" class _KinematicsInformation: @@ -260,15 +260,15 @@ def _dybosonpt_xq2map(kin_dict): def _dymll_xq2map(kin_info): """ Computes x and q2 mapping for DY Z -> 2 leptons mass. - Here we calculate m_ll^2 and sqrt(s). + Here we calculate M_ll^2 and sqrt(s). """ - m_ll = kin_info.get_one_of(_Vars.m_ll) + M_ll = kin_info.get_one_of(_Vars.M_ll) sqrts = kin_info.get_one_of(_Vars.sqrts) - m_ll2 = m_ll**2 - x = np.sqrt(m_ll) / sqrts + M_ll2 = M_ll**2 + x = np.sqrt(M_ll) / sqrts - return x, m_ll2 + return x, M_ll2 DIS = _Process( @@ -373,7 +373,7 @@ def _dymll_xq2map(kin_info): DY_MLL = _Process( "DY_MLL", "DY Z -> ll mass of lepton pair", - accepted_variables=(_Vars.m_ll, _Vars.sqrts), + accepted_variables=(_Vars.M_ll, _Vars.sqrts), xq2map_function=_dymll_xq2map, ) From c25723892cc6dd055afe85506196944a3dd0a3a6 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Fri, 29 Nov 2024 09:59:34 +0000 Subject: [PATCH 11/17] Edited metadata to remove sqrts as a kinematic, added DY_MLL to commondataparser.py --- .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 1 - .../ATLAS_Z0_7TEV_49FB/kinematics.yaml | 52 ------------------- .../ATLAS_Z0_7TEV_49FB/metadata.yaml | 16 +++--- validphys2/src/validphys/commondataparser.py | 2 + 4 files changed, 9 insertions(+), 62 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py index 298ec110c5..e01506339e 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -44,7 +44,6 @@ def get_kinematics(): kin_value = { 'M_ll': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, - 'sqrts': {'min': None, 'mid': 7000.0, 'max': None}, } kin.append(kin_value) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml index e556307c26..c030e9f71d 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml @@ -3,103 +3,51 @@ bins: min: null mid: 123.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 140.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 160.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 180.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 200.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 220.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 240.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 275.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 350.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 450.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 600.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 850.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null - M_ll: min: null mid: 1250.0 max: null - sqrts: - min: null - mid: 7000.0 - max: null diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index e31b940585..99cf19305b 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -1,5 +1,5 @@ setname: ATLAS_Z0_7TEV_49FB -version: 1 +version: 2 version_comment: Reimplementation of old commondata nnpdf_metadata: nnpdf31_process: DY NC @@ -18,7 +18,7 @@ implemented_observables: description: Drell-Yan Mass Distribution label: ATLAS HM DY 7 TeV units: '' - process_type: DY_MLL + process_type: "DY_MLL" tables: [1] npoints: [] ndata: 13 @@ -27,21 +27,15 @@ implemented_observables: dataset_label: ATLAS HM DY 7 TeV y_label: $d\sigma_{Z/\gamma^{*}}/dM_{ll}$ (fb) y_scale: log - plot_x: M_ll #Not sure how to change this to M_ll2 + plot_x: M_ll kinematic_coverage: - M_ll - - sqrts kinematics: variables: M_ll: description: Mass of lepton pair label: M_ll units: 'GeV' - sqrts: - description: Square root of centre of mass energy - label: sqrts - units: 'GeV' - file: kinematics.yaml theory: conversion_factor: 1000.0 @@ -50,5 +44,9 @@ implemented_observables: - - ATLAS_DY_7TEV_49FB_HIMASS data_uncertainties: - uncertainties.yaml + # variants: + # legacy: + # data_uncertainties: + # - uncertainties_legacy_HIMASS.yaml data_central: data.yaml ported_from: ATLASZHIGHMASS49FB diff --git a/validphys2/src/validphys/commondataparser.py b/validphys2/src/validphys/commondataparser.py index 6def4d2dfd..a64753ed3c 100644 --- a/validphys2/src/validphys/commondataparser.py +++ b/validphys2/src/validphys/commondataparser.py @@ -112,6 +112,7 @@ def _quick_yaml_load(filepath): "SHP_ASY": ("$\\eta$", "$p_T (GeV)$", "$\\sqrt{s} (GeV)$"), "JET_POL": ("$\\eta$", "$p_T^2 (GeV^2)$", "$\\sqrt{s} (GeV)$"), "DIJET_POL": ("$\\m_{1,2} (GeV)", "$\\eta_1$", "$\\eta_2$"), + "DY_MLL": ("$M_{ll} (GeV)$", "$M_{ll}^2 (GeV^2)$", "$\\sqrt{s} (GeV)$"), } PROCESS_DESCRIPTION_LABEL = { @@ -139,6 +140,7 @@ def _quick_yaml_load(filepath): "JET_POL": "Inclusive Jet longitudinal double-spin asymmetry", "DIJET_POL": "Dijets longitudinal double-spin asymmetry", "SHP_ASY": "double spin asymmetry in single hadron production", + "DY_MLL": "Drell-Yan Mass Distribution of Lepton Pairs", } From 36c183467a2487c9080c90158f9fa19801105b7c Mon Sep 17 00:00:00 2001 From: ecole41 Date: Fri, 29 Nov 2024 10:41:33 +0000 Subject: [PATCH 12/17] Added legacy variant back to metadata, changed it to point to new uncertainties.yaml --- .../commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index 99cf19305b..d5ab8face4 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -44,9 +44,9 @@ implemented_observables: - - ATLAS_DY_7TEV_49FB_HIMASS data_uncertainties: - uncertainties.yaml - # variants: - # legacy: - # data_uncertainties: - # - uncertainties_legacy_HIMASS.yaml + variants: + legacy: + data_uncertainties: + - uncertainties.yaml data_central: data.yaml ported_from: ATLASZHIGHMASS49FB From 4d5612681f21613240ae8bf490e272418c6991c9 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Fri, 29 Nov 2024 10:46:33 +0000 Subject: [PATCH 13/17] Changed M_ll label to $M_ll$ --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index d5ab8face4..7e1a292286 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -34,7 +34,7 @@ implemented_observables: variables: M_ll: description: Mass of lepton pair - label: M_ll + label: "$M_ll$" units: 'GeV' file: kinematics.yaml theory: From a53d0752af18a101059ea8c81b62641e72d016d1 Mon Sep 17 00:00:00 2001 From: Eleanor Cole Date: Thu, 5 Dec 2024 10:13:59 +0000 Subject: [PATCH 14/17] Update validphys2/src/validphys/process_options.py Co-authored-by: Juan M. Cruz-Martinez --- validphys2/src/validphys/process_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 413ed7678a..bc682a707b 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -266,7 +266,7 @@ def _dymll_xq2map(kin_info): M_ll = kin_info.get_one_of(_Vars.M_ll) sqrts = kin_info.get_one_of(_Vars.sqrts) M_ll2 = M_ll**2 - x = np.sqrt(M_ll) / sqrts + x = M_ll / sqrts return x, M_ll2 From ce87eb2c14e77bb85e01d9cccaa713c32ecec8f0 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Thu, 5 Dec 2024 10:21:26 +0000 Subject: [PATCH 15/17] edited x=M_ll/sqrts --- validphys2/src/validphys/process_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 413ed7678a..bc682a707b 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -266,7 +266,7 @@ def _dymll_xq2map(kin_info): M_ll = kin_info.get_one_of(_Vars.M_ll) sqrts = kin_info.get_one_of(_Vars.sqrts) M_ll2 = M_ll**2 - x = np.sqrt(M_ll) / sqrts + x = M_ll / sqrts return x, M_ll2 From 9e07232b800b7aa13c43acc644452f4bddc18246 Mon Sep 17 00:00:00 2001 From: ecole41 Date: Thu, 5 Dec 2024 11:15:23 +0000 Subject: [PATCH 16/17] Changed M_ll to m_ll and added m_ll2 back --- .../ATLAS_Z0_7TEV_49FB/filter_utils.py | 4 +-- .../ATLAS_Z0_7TEV_49FB/kinematics.yaml | 26 +++++++++---------- .../ATLAS_Z0_7TEV_49FB/metadata.yaml | 8 +++--- validphys2/src/validphys/cuts/filters.yaml | 2 +- .../cuts/lockfiles/31_filters.lock.yaml | 2 +- validphys2/src/validphys/process_options.py | 13 +++++----- 6 files changed, 27 insertions(+), 28 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py index e01506339e..8f4073c4d2 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/filter_utils.py @@ -42,9 +42,7 @@ def get_kinematics(): for i, M in enumerate(input["independent_variables"][0]['values']): - kin_value = { - 'M_ll': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}, - } + kin_value = {'m_ll': {'min': None, 'mid': (0.5 * (M['low'] + M['high'])), 'max': None}} kin.append(kin_value) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml index c030e9f71d..4ef504f00f 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/kinematics.yaml @@ -1,53 +1,53 @@ bins: -- M_ll: +- m_ll: min: null mid: 123.0 max: null -- M_ll: +- m_ll: min: null mid: 140.0 max: null -- M_ll: +- m_ll: min: null mid: 160.0 max: null -- M_ll: +- m_ll: min: null mid: 180.0 max: null -- M_ll: +- m_ll: min: null mid: 200.0 max: null -- M_ll: +- m_ll: min: null mid: 220.0 max: null -- M_ll: +- m_ll: min: null mid: 240.0 max: null -- M_ll: +- m_ll: min: null mid: 275.0 max: null -- M_ll: +- m_ll: min: null mid: 350.0 max: null -- M_ll: +- m_ll: min: null mid: 450.0 max: null -- M_ll: +- m_ll: min: null mid: 600.0 max: null -- M_ll: +- m_ll: min: null mid: 850.0 max: null -- M_ll: +- m_ll: min: null mid: 1250.0 max: null diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index 7e1a292286..1755d0b8e5 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -27,14 +27,14 @@ implemented_observables: dataset_label: ATLAS HM DY 7 TeV y_label: $d\sigma_{Z/\gamma^{*}}/dM_{ll}$ (fb) y_scale: log - plot_x: M_ll + plot_x: m_ll kinematic_coverage: - - M_ll + - m_ll kinematics: variables: - M_ll: + m_ll: description: Mass of lepton pair - label: "$M_ll$" + label: "$m_ll$" units: 'GeV' file: kinematics.yaml theory: diff --git a/validphys2/src/validphys/cuts/filters.yaml b/validphys2/src/validphys/cuts/filters.yaml index 665631f061..06056ea874 100644 --- a/validphys2/src/validphys/cuts/filters.yaml +++ b/validphys2/src/validphys/cuts/filters.yaml @@ -299,7 +299,7 @@ reason: Avoid the region where resummation effects become important. local_variables: max_M: 200.0 - rule: M_ll <= max_M + rule: m_ll <= max_M - dataset: ATLAS_Z0_7TEV_LOMASS_M diff --git a/validphys2/src/validphys/cuts/lockfiles/31_filters.lock.yaml b/validphys2/src/validphys/cuts/lockfiles/31_filters.lock.yaml index c5945c7ffa..631a3c7601 100644 --- a/validphys2/src/validphys/cuts/lockfiles/31_filters.lock.yaml +++ b/validphys2/src/validphys/cuts/lockfiles/31_filters.lock.yaml @@ -192,7 +192,7 @@ reason: Avoid the region where resummation effects become important. local_variables: max_M: 200.0 - rule: M_ll <= max_M + rule: m_ll <= max_M # - dataset: LHCBLOWMASS37PB # rule: "pT <= maxCMSDY2Dminv" diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index f50cd07fe0..c659d76ace 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -37,7 +37,8 @@ class _Vars: abs_eta_2 = "abs_eta_2" eta_1 = "eta_1" eta_2 = "eta_2" - M_ll = "M_ll" + m_ll = "m_ll" + m_ll2 = "m_ll2" class _KinematicsInformation: @@ -308,12 +309,12 @@ def _dymll_xq2map(kin_info): Here we calculate M_ll^2 and sqrt(s). """ - M_ll = kin_info.get_one_of(_Vars.M_ll) + m_ll = kin_info.get_one_of(_Vars.m_ll) sqrts = kin_info.get_one_of(_Vars.sqrts) - M_ll2 = M_ll**2 - x = M_ll / sqrts + m_ll2 = m_ll**2 + x = m_ll / sqrts - return x, M_ll2 + return x, m_ll2 DIS = _Process( @@ -426,7 +427,7 @@ def _dymll_xq2map(kin_info): DY_MLL = _Process( "DY_MLL", "DY Z -> ll mass of lepton pair", - accepted_variables=(_Vars.M_ll, _Vars.sqrts), + accepted_variables=(_Vars.m_ll, _Vars.sqrts), xq2map_function=_dymll_xq2map, ) From d2b874621f4308b40e84fe90d5323b309f1122ae Mon Sep 17 00:00:00 2001 From: ecole41 Date: Thu, 5 Dec 2024 14:21:12 +0000 Subject: [PATCH 17/17] Latex error --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml index 1755d0b8e5..d1c801d942 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_49FB/metadata.yaml @@ -34,7 +34,7 @@ implemented_observables: variables: m_ll: description: Mass of lepton pair - label: "$m_ll$" + label: "$m_{ll}$" units: 'GeV' file: kinematics.yaml theory: