From 1abf6061346848bff66ba70a3cab0aa559cea7a7 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 7 Dec 2024 14:02:18 +0000 Subject: [PATCH 01/24] rebase --- .../rawdata/EICC_3_20_A1c_100fb-1.txt | 20 ------------------ .../rawdata/EICC_NC_15GEV_EP.yaml | 21 ------------------- .../rawdata/EICC_5_25_A1c_100fb-1.txt | 20 ------------------ .../rawdata/EICC_NC_22GEV_EP.yaml | 21 ------------------- 4 files changed, 82 deletions(-) delete mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt delete mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml delete mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt delete mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt b/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt deleted file mode 100644 index 5186e33a69..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt +++ /dev/null @@ -1,20 +0,0 @@ -0.0118543 2.33943 0.0131741 -0.0147498 2.67647 0.0137443 -0.0170879 2.92672 0.0145816 -0.0193576 3.14972 0.0148745 -0.0216843 3.38092 0.0154729 -0.024134 3.61084 0.0163357 -0.026757 3.83911 0.0166505 -0.029609 4.07714 0.0173117 -0.0327378 4.32469 0.0177981 -0.036235 4.62301 0.0184076 -0.0401922 4.91469 0.0196155 -0.0447057 5.22312 0.0201606 -0.0498705 5.57079 0.0206674 -0.0559157 5.90818 0.0224443 -0.063158 6.30866 0.0235975 -0.0719283 6.76403 0.0249343 -0.082977 7.29287 0.028093 -0.098045 8.23912 0.0294843 -0.122323 9.93854 0.03264 -0.194617 15.7033 0.0412479 diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml b/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml deleted file mode 100644 index 0562a740c6..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml +++ /dev/null @@ -1,21 +0,0 @@ -predictions_central: -- 0.011097089442581837 -- 0.09180508550690122 -- 0.15658771839531252 -- 0.21658542437898215 -- 0.2733648433555605 -- 0.32709314037346454 -- 0.3795997648037312 -- 0.43046049493249394 -- 0.4799201187391007 -- 0.5228764488739448 -- 0.5694608817943462 -- 0.6157591489415317 -- 0.6595102861408507 -- 0.7098349904876488 -- 0.7554780740416784 -- 0.8009837395209464 -- 0.8441110005347789 -- 0.8568572809328947 -- 0.8381534635862304 -- 0.6154780492789568 diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt b/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt deleted file mode 100644 index 12b9a0b461..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt +++ /dev/null @@ -1,20 +0,0 @@ -0.0068164 2.35927 0.00858772 -0.00867301 2.70472 0.00918325 -0.0101997 2.9482 0.00989902 -0.0116997 3.18471 0.0105122 -0.0132466 3.41175 0.010999 -0.0148812 3.63892 0.0115985 -0.01666 3.8813 0.0119657 -0.018605 4.1459 0.01256 -0.0207568 4.43653 0.0129563 -0.0232027 4.74319 0.0135662 -0.0260104 5.05546 0.0141511 -0.0292666 5.42151 0.0149317 -0.0330757 5.86492 0.0155973 -0.0377102 6.34746 0.0165588 -0.0434833 6.871 0.0174989 -0.0507568 7.45673 0.0188441 -0.0604552 8.18451 0.0205689 -0.0743193 9.18998 0.0232922 -0.096939 10.822 0.0266716 -0.165807 17.5539 0.0342092 diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml b/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml deleted file mode 100644 index 5f704ee5f1..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml +++ /dev/null @@ -1,21 +0,0 @@ -predictions_central: -- 0.01690140150151845 -- 0.03799297384460928 -- 0.05710275561329077 -- 0.07762258926087376 -- 0.09932086711226819 -- 0.12242792820252063 -- 0.14721385100561526 -- 0.17330143241808899 -- 0.20034418866162207 -- 0.22955441987873032 -- 0.2623011177652174 -- 0.29644478865289314 -- 0.33054992057959237 -- 0.36998374710481025 -- 0.4157827639813768 -- 0.4692028046680297 -- 0.5282138881409599 -- 0.5929997918872923 -- 0.6562638351062493 -- 0.5928517692404429 From becaa8eb133c289c263792aa42aba94f7ab49845 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 10:45:09 +0100 Subject: [PATCH 02/24] added url to inspire --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3959282c5c..99b5a4b8b2 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 @@ -8,7 +8,7 @@ arXiv: url: https://arxiv.org/abs/1404.1212 journal: JHEP 06 (2014) 112 iNSPIRE: - url: '' + url: 'https://inspirehep.net/literature/1288706' hepdata: url: 10.17182/hepdata.64183.v1/t6 version: -1 From 658d74de931a8edfff6532a1d12081ee4c0f2c4f Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 10:48:07 +0100 Subject: [PATCH 03/24] added no of hepdata table --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 99b5a4b8b2..86bf62e1cc 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 @@ -19,7 +19,7 @@ implemented_observables: label: ATLAS low-mass DY 2011 units: '' process_type: EWK_MLL - tables: [] + tables: [6] npoints: [] ndata: 6 plotting: From 6f468eb13a22b4197b1edc6af2e428f372939669 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 11:01:21 +0100 Subject: [PATCH 04/24] added hepdata --- .../HEPData-ins1288706-v1-Table_6.yaml | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/HEPData-ins1288706-v1-Table_6.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/HEPData-ins1288706-v1-Table_6.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/HEPData-ins1288706-v1-Table_6.yaml new file mode 100644 index 0000000000..636c071777 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/HEPData-ins1288706-v1-Table_6.yaml @@ -0,0 +1,116 @@ +dependent_variables: +- header: {name: D(SIG)/DM, units: PB/GEV} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - errors: + - {label: stat, symerror: 4.2%} + - {label: sys, symerror: 12.6%} + value: 12.41 + - errors: + - {label: stat, symerror: 3.1%} + - {label: sys, symerror: 12.3%} + value: 22.57 + - errors: + - {label: stat, symerror: 3.3%} + - {label: sys, symerror: 9.5%} + value: 14.64 + - errors: + - {label: stat, symerror: 4.0%} + - {label: sys, symerror: 7.4%} + value: 6.73 + - errors: + - {label: stat, symerror: 5.2%} + - {label: sys, symerror: 5.7%} + value: 2.81 + - errors: + - {label: stat, symerror: 4.7%} + - {label: sys, symerror: 5.2%} + value: 1.27 +- header: {name: TOTAL ERROR, units: PCT} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 13.3} + - {value: 12.7} + - {value: 10.0} + - {value: 8.5} + - {value: 7.8} + - {value: 7.1} +- header: {name: D} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 1.0} + - {value: 0.98} + - {value: 0.98} + - {value: 0.99} + - {value: 1.02} + - {value: 1.16} +- header: {name: A} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 0.04} + - {value: 0.2} + - {value: 0.3} + - {value: 0.35} + - {value: 0.39} + - {value: 0.43} +- header: {name: delta(A)_scale down, units: PCT} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 7.1} + - {value: 3.7} + - {value: 0.4} + - {value: 0.3} + - {value: 0.3} + - {value: 0.4} +- header: {name: delta(A)_scale up, units: PCT} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 7.5} + - {value: 4.2} + - {value: 0.8} + - {value: 0.3} + - {value: 0.4} + - {value: 0.7} +- header: {name: delta(A)_pdf_alpha_s down, units: PCT} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 4.1} + - {value: 3.0} + - {value: 2.3} + - {value: 1.8} + - {value: 1.3} + - {value: 1.0} +- header: {name: delta(A)_pdf_alpha_s up, units: PCT} + qualifiers: + - {name: RE, value: P P --> MU+ MU- X} + - {name: SQRT(S), units: GeV, value: '7000.0'} + values: + - {value: 2.7} + - {value: 2.0} + - {value: 1.6} + - {value: 1.2} + - {value: 0.9} + - {value: 0.6} +independent_variables: +- header: {name: M, units: GEV} + values: + - {high: 17.0, low: 12.0} + - {high: 22.0, low: 17.0} + - {high: 28.0, low: 22.0} + - {high: 36.0, low: 28.0} + - {high: 46.0, low: 36.0} + - {high: 66.0, low: 46.0} From 1abf485c13f3cc48badac8b9f4f9bad81be698c0 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 11:01:52 +0100 Subject: [PATCH 05/24] added systematics data from page 22 of preprint 1404.1212 --- .../rawdata/ATLASLOMASSDY11EXT.data | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data new file mode 100644 index 0000000000..63381039b5 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data @@ -0,0 +1,16 @@ + Mlow Mhigh y stat+ stat- sys_reco sys_trig sys_iso sys_mjet sys_pTsc sys_res sys_MC Lumi +----------------------------------------------------------------------------------------------------------------------------- + 12.0 17.0 12.41 +0.52122 -0.52122 2.5 4.0 11.3 -3.0 -0.2 0.5 0.6 3.5 + 17.0 22.0 22.57 +0.69967 -0.69967 1.4 3.7 11.3 -2.8 0.1 0.3 0.3 3.5 + 22.0 28.0 14.64 +0.48312 -0.48312 0.9 3.6 8.5 -1.8 0.0 0.1 0.4 3.5 + 28.0 36.0 6.73 +0.26920 -0.26920 0.7 3.6 6.2 -1.6 -0.1 0.2 0.4 3.5 + 36.0 46.0 2.81 +0.14612 -0.14612 0.7 3.6 4.2 -1.3 -0.1 0.1 0.5 3.5 + 46.0 66.0 1.27 +0.05969 -0.05969 0.6 3.6 3.6 -0.7 -0.0 0.1 0.5 3.5 + + +Path: /HepData/8644/d6-x1-y1 +Born-level fiducial differential cross section dsigma/dm_ll [pb/GeV], with statistical, systematic and Lumi uncertainties +Location: Table 6-7, Page 22 of preprint +RE : P P --> MU+ MU- X +SQRT(S) : 7000.0 GeV + From 3a8e1bcd1a4c15af8f3546f6c551582c6dba488a Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 11:45:35 +0100 Subject: [PATCH 06/24] added rawdata in csv format --- .../ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv new file mode 100644 index 0000000000..cfaf22b280 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv @@ -0,0 +1,7 @@ +Mlow, Mhigh,y,stat,sys_reco,sys_trig,sys_iso,sys_mjet,sys_pTsc,sys_res,sys_MC,lumi +12.0,17,12.41,0.52122,2.5,4.0,11.3,-3.0,-0.2,0.5,0.6,3.5 +17.0,22.0,22.57,0.69967,1.4,3.7,11.3,-2.8,0.1,0.3,0.3,3.5 +22.0,28.0,14.64,0.48312,0.9,3.6,8.5,-1.8,0.0,0.4,0.4,3.5 +28.0,36.0,6.73,0.26920,0.7,3.6,6.2,-1.6,-0.1,0.4,0.4,3.5 +36.0,46.0,2.81,0.14612,0.7,3.6,4.2,-1.3,-0.1,0.5,0.5,3.5 +46.0,66.0,1.27,0.05969,0.6,3.6,3.6,-0.7,0.0,0.5,0.5,3.5 \ No newline at end of file From 00c5fdbb54686c503ff7663bbd3f6a8e3492398d Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 12:08:04 +0100 Subject: [PATCH 07/24] added filter utils file --- .../ATLAS_Z0_7TEV_LOMASS/filter_utils.py | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter_utils.py 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 new file mode 100644 index 0000000000..bf0892d2bd --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter_utils.py @@ -0,0 +1,70 @@ +""" +This module contains helper functions that are used to extract the uncertainties, kinematics and data values +from the rawdata files. +""" + +import yaml +import pandas as pd +import numpy as np + + +def get_kinematics(): + """ + returns the kinematics in the form of a list of dictionaries. + """ + kin = [] + + hepdata_table = f"rawdata/HEPData-ins1288706-v1-Table_6.yaml" + + 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']), 'max': M['high']}, + 'sqrts': {'min': None, 'mid': 7000.0, 'max': None}, + } + + kin.append(kin_value) + + return kin + + +def get_data_values(): + """ + returns the central data values in the form of a numpy array. + """ + + data_central = [] + + hepdata_table = f"rawdata/HEPData-ins1288706-v1-Table_6.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 np.array(data_central) + + +def get_systematics(): + """ + returns the absolute systematic uncertainties in the form of a pandas dataframe. + """ + sys_rawdata_path = "rawdata/ATLASLOMASSDY11EXT.csv" + + df = pd.read_csv(sys_rawdata_path) + data_central = get_data_values() + + # convert (MULT) percentage unc to absolute unc + abs_unc_df = (df.T[3:] * data_central).T / 100 + + return abs_unc_df From 695031d0626f38599155ec92ae53309fff567ed2 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 12:16:02 +0100 Subject: [PATCH 08/24] added filter for data and kinematics --- .../commondata/ATLAS_Z0_7TEV_LOMASS/filter.py | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py new file mode 100644 index 0000000000..8fed5b1cc9 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py @@ -0,0 +1,32 @@ +""" +filter.py module for ATLAS_Z0_7TEV_LOMASS dataset + +When running `python filter.py` the relevant uncertainties , data and kinematics yaml +file will be created in the `nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS` directory. +""" +import yaml +from filter_utils import get_kinematics, get_data_values, get_systematics + + +def filter_ATLAS_Z0_7TEV_LOMASS_data_kinetic(): + """ + This function writes the central values and kinematics to yaml files. + """ + + kin = get_kinematics() + central_values = list(get_data_values()) + + 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_LOMASS_data_kinetic() \ No newline at end of file From 4e3e2ee2ff46ff5bd1068dc2ed5cd11bfcc8cca2 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 12:16:13 +0100 Subject: [PATCH 09/24] added data.yaml --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data.yaml new file mode 100644 index 0000000000..e89a5e2c88 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data.yaml @@ -0,0 +1,7 @@ +data_central: +- 12410.0 +- 22570.0 +- 14640.0 +- 6730.0 +- 2810.0 +- 1270.0 From 3e99360094fab9cf527fae2be1a9f5cdf44e2717 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 12:16:26 +0100 Subject: [PATCH 10/24] added kinematics.yaml --- .../ATLAS_Z0_7TEV_LOMASS/kinematics.yaml | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics.yaml 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 new file mode 100644 index 0000000000..54cd594664 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics.yaml @@ -0,0 +1,73 @@ +bins: +- y: + min: null + mid: 12.41 + max: null + M2: + min: 144.0 + mid: 210.25 + max: 289.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 + 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 + 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 + 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 + 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 + sqrts: + min: null + mid: 7000.0 + max: null From 2e0f1b7f34f239236ceae62b722ceaa04cf14023 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 13:53:27 +0100 Subject: [PATCH 11/24] added get sys to filter utils --- .../ATLAS_Z0_7TEV_LOMASS/filter_utils.py | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) 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 bf0892d2bd..6b662669bf 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 @@ -25,7 +25,11 @@ def get_kinematics(): kin_value = { 'y': {'min': None, 'mid': y_values[i], 'max': None}, - 'M2': {'min': M['low'] ** 2, 'mid': 0.5 * (M['low'] + M['high']), 'max': M['high']}, + '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}, } @@ -36,7 +40,7 @@ def get_kinematics(): def get_data_values(): """ - returns the central data values in the form of a numpy array. + returns the central data values in the form of a list. """ data_central = [] @@ -52,19 +56,33 @@ def get_data_values(): # store data central and convert the units data_central.append(value['value'] * 1000) - return np.array(data_central) + return data_central -def get_systematics(): +def get_systematics_dataframe(): """ returns the absolute systematic uncertainties in the form of a pandas dataframe. """ sys_rawdata_path = "rawdata/ATLASLOMASSDY11EXT.csv" df = pd.read_csv(sys_rawdata_path) - data_central = get_data_values() + 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 From 75d17493ceff564524d154f49d4bd51889ceee64 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 14:10:13 +0100 Subject: [PATCH 12/24] uncertainties.yaml file --- .../ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml new file mode 100644 index 0000000000..8ec5d92580 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml @@ -0,0 +1,92 @@ +definitions: + stat: + description: stat + treatment: MULT + type: UNCORR + sys_reco: + description: sys_reco + treatment: MULT + type: CORR + sys_trig: + description: sys_trig + treatment: MULT + type: CORR + sys_iso: + description: sys_iso + treatment: MULT + type: CORR + sys_mjet: + description: sys_mjet + treatment: MULT + type: CORR + sys_pTsc: + description: sys_pTsc + treatment: MULT + type: CORR + sys_res: + description: sys_res + treatment: MULT + type: UNCORR + sys_MC: + description: sys_MC + treatment: MULT + type: UNCORR + lumi: + description: lumi + treatment: MULT + type: CORR +bins: +- stat: 64.683402 + sys_reco: 310.25 + sys_trig: 496.4 + sys_iso: 1402.33 + sys_mjet: -372.3 + sys_pTsc: -24.82 + sys_res: 62.05 + sys_MC: 74.46 + lumi: 434.35 +- stat: 157.91551900000002 + sys_reco: 315.97999999999996 + sys_trig: 835.09 + sys_iso: 2550.4100000000003 + sys_mjet: -631.9599999999999 + sys_pTsc: 22.57 + sys_res: 67.71 + sys_MC: 67.71 + lumi: 789.95 +- stat: 70.728768 + sys_reco: 131.76 + sys_trig: 527.04 + sys_iso: 1244.4 + sys_mjet: -263.52 + sys_pTsc: 0.0 + sys_res: 58.56 + sys_MC: 58.56 + lumi: 512.4 +- stat: 18.11716 + sys_reco: 47.11 + sys_trig: 242.28 + sys_iso: 417.26 + sys_mjet: -107.68 + sys_pTsc: -6.73 + sys_res: 26.92 + sys_MC: 26.92 + lumi: 235.55 +- stat: 4.1059719999999995 + sys_reco: 19.669999999999998 + sys_trig: 101.16 + sys_iso: 118.02 + sys_mjet: -36.53 + sys_pTsc: -2.81 + sys_res: 14.05 + sys_MC: 14.05 + lumi: 98.35 +- stat: 0.7580629999999999 + sys_reco: 7.62 + sys_trig: 45.72 + sys_iso: 45.72 + sys_mjet: -8.89 + sys_pTsc: 0.0 + sys_res: 6.35 + sys_MC: 6.35 + lumi: 44.45 From 0513fc86fb83fa34ca33e544c9b6052ce1454601 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 14:11:02 +0100 Subject: [PATCH 13/24] written filter for systematics --- .../commondata/ATLAS_Z0_7TEV_LOMASS/filter.py | 56 ++++++++++++++++++- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py index 8fed5b1cc9..bf07b14ca2 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py @@ -4,6 +4,7 @@ When running `python filter.py` the relevant uncertainties , data and kinematics yaml file will be created in the `nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS` directory. """ + import yaml from filter_utils import get_kinematics, get_data_values, get_systematics @@ -19,7 +20,7 @@ def filter_ATLAS_Z0_7TEV_LOMASS_data_kinetic(): 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) @@ -28,5 +29,56 @@ def filter_ATLAS_Z0_7TEV_LOMASS_data_kinetic(): yaml.dump(kinematics_yaml, file, sort_keys=False) +def filter_ATLAS_Z0_7TEV_LOMASS_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') + or (sys[0]['name'] == 'sys_res') + or (sys[0]['name'] == 'sys_MC') + ): + error_definitions[sys[0]['name']] = { + "description": f"{sys[0]['name']}", + "treatment": "MULT", + "type": "UNCORR", + } + + 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_LOMASS_data_kinetic() \ No newline at end of file + filter_ATLAS_Z0_7TEV_LOMASS_data_kinetic() + filter_ATLAS_Z0_7TEV_LOMASS_systematics() From 2a0e07047c968b6d9d1e664f1e5c3c4692b6fe92 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 14:19:03 +0100 Subject: [PATCH 14/24] removed legacy data central values are they are the same --- .../commondata/ATLAS_Z0_7TEV_LOMASS/data_legacy_M.yaml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data_legacy_M.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data_legacy_M.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data_legacy_M.yaml deleted file mode 100644 index e89a5e2c88..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/data_legacy_M.yaml +++ /dev/null @@ -1,7 +0,0 @@ -data_central: -- 12410.0 -- 22570.0 -- 14640.0 -- 6730.0 -- 2810.0 -- 1270.0 From 0b51ddd2122b30ab7470d7e6d26bb988e4fdfd3f Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 14:38:17 +0100 Subject: [PATCH 15/24] corrected csv dataset --- .../commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 5 +++-- .../ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv | 8 ++++---- .../commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) 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 86bf62e1cc..6339f96375 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 @@ -51,10 +51,11 @@ implemented_observables: operation: 'null' FK_tables: - - ATLAS_DY_7TEV_LOMASS_EXT - data_uncertainties: [] + data_uncertainties: + - uncertainties.yaml variants: legacy: data_uncertainties: - uncertainties_legacy_M.yaml - data_central: data_legacy_M.yaml + data_central: data.yaml ported_from: ATLASLOMASSDY11EXT diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv index cfaf22b280..e3e5ce42ab 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv @@ -1,7 +1,7 @@ Mlow, Mhigh,y,stat,sys_reco,sys_trig,sys_iso,sys_mjet,sys_pTsc,sys_res,sys_MC,lumi 12.0,17,12.41,0.52122,2.5,4.0,11.3,-3.0,-0.2,0.5,0.6,3.5 17.0,22.0,22.57,0.69967,1.4,3.7,11.3,-2.8,0.1,0.3,0.3,3.5 -22.0,28.0,14.64,0.48312,0.9,3.6,8.5,-1.8,0.0,0.4,0.4,3.5 -28.0,36.0,6.73,0.26920,0.7,3.6,6.2,-1.6,-0.1,0.4,0.4,3.5 -36.0,46.0,2.81,0.14612,0.7,3.6,4.2,-1.3,-0.1,0.5,0.5,3.5 -46.0,66.0,1.27,0.05969,0.6,3.6,3.6,-0.7,0.0,0.5,0.5,3.5 \ No newline at end of file +22.0,28.0,14.64,0.48312,0.9,3.6,8.5,-1.8,0.0,0.1,0.4,3.5 +28.0,36.0,6.73,0.26920,0.7,3.6,6.2,-1.6,-0.1,0.2,0.4,3.5 +36.0,46.0,2.81,0.14612,0.7,3.6,4.2,-1.3,-0.1,0.1,0.5,3.5 +46.0,66.0,1.27,0.05969,0.6,3.6,3.6,-0.7,0.0,0.1,0.5,3.5 \ No newline at end of file diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml index 8ec5d92580..b2040d02d0 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml @@ -60,7 +60,7 @@ bins: sys_iso: 1244.4 sys_mjet: -263.52 sys_pTsc: 0.0 - sys_res: 58.56 + sys_res: 14.64 sys_MC: 58.56 lumi: 512.4 - stat: 18.11716 @@ -69,7 +69,7 @@ bins: sys_iso: 417.26 sys_mjet: -107.68 sys_pTsc: -6.73 - sys_res: 26.92 + sys_res: 13.46 sys_MC: 26.92 lumi: 235.55 - stat: 4.1059719999999995 @@ -78,7 +78,7 @@ bins: sys_iso: 118.02 sys_mjet: -36.53 sys_pTsc: -2.81 - sys_res: 14.05 + sys_res: 2.81 sys_MC: 14.05 lumi: 98.35 - stat: 0.7580629999999999 @@ -87,6 +87,6 @@ bins: sys_iso: 45.72 sys_mjet: -8.89 sys_pTsc: 0.0 - sys_res: 6.35 + sys_res: 1.27 sys_MC: 6.35 lumi: 44.45 From 0f16c60fbe7d77170971b2a4641b89f9b575c118 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 14:43:54 +0100 Subject: [PATCH 16/24] take stat uncertainty from the HEP data file --- .../rawdata/ATLASLOMASSDY11EXT.csv | 12 ++++++------ .../ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv index e3e5ce42ab..aa00fd105d 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.csv @@ -1,7 +1,7 @@ Mlow, Mhigh,y,stat,sys_reco,sys_trig,sys_iso,sys_mjet,sys_pTsc,sys_res,sys_MC,lumi -12.0,17,12.41,0.52122,2.5,4.0,11.3,-3.0,-0.2,0.5,0.6,3.5 -17.0,22.0,22.57,0.69967,1.4,3.7,11.3,-2.8,0.1,0.3,0.3,3.5 -22.0,28.0,14.64,0.48312,0.9,3.6,8.5,-1.8,0.0,0.1,0.4,3.5 -28.0,36.0,6.73,0.26920,0.7,3.6,6.2,-1.6,-0.1,0.2,0.4,3.5 -36.0,46.0,2.81,0.14612,0.7,3.6,4.2,-1.3,-0.1,0.1,0.5,3.5 -46.0,66.0,1.27,0.05969,0.6,3.6,3.6,-0.7,0.0,0.1,0.5,3.5 \ No newline at end of file +12.0,17,12.41,4.2,2.5,4.0,11.3,-3.0,-0.2,0.5,0.6,3.5 +17.0,22.0,22.57,3.1,1.4,3.7,11.3,-2.8,0.1,0.3,0.3,3.5 +22.0,28.0,14.64,3.3,0.9,3.6,8.5,-1.8,0.0,0.1,0.4,3.5 +28.0,36.0,6.73,4.0,0.7,3.6,6.2,-1.6,-0.1,0.2,0.4,3.5 +36.0,46.0,2.81,5.2,0.7,3.6,4.2,-1.3,-0.1,0.1,0.5,3.5 +46.0,66.0,1.27,4.7,0.6,3.6,3.6,-0.7,0.0,0.1,0.5,3.5 \ No newline at end of file diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml index b2040d02d0..688f0cbe66 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml @@ -36,7 +36,7 @@ definitions: treatment: MULT type: CORR bins: -- stat: 64.683402 +- stat: 521.22 sys_reco: 310.25 sys_trig: 496.4 sys_iso: 1402.33 @@ -45,7 +45,7 @@ bins: sys_res: 62.05 sys_MC: 74.46 lumi: 434.35 -- stat: 157.91551900000002 +- stat: 699.67 sys_reco: 315.97999999999996 sys_trig: 835.09 sys_iso: 2550.4100000000003 @@ -54,7 +54,7 @@ bins: sys_res: 67.71 sys_MC: 67.71 lumi: 789.95 -- stat: 70.728768 +- stat: 483.12 sys_reco: 131.76 sys_trig: 527.04 sys_iso: 1244.4 @@ -63,7 +63,7 @@ bins: sys_res: 14.64 sys_MC: 58.56 lumi: 512.4 -- stat: 18.11716 +- stat: 269.2 sys_reco: 47.11 sys_trig: 242.28 sys_iso: 417.26 @@ -72,7 +72,7 @@ bins: sys_res: 13.46 sys_MC: 26.92 lumi: 235.55 -- stat: 4.1059719999999995 +- stat: 146.12 sys_reco: 19.669999999999998 sys_trig: 101.16 sys_iso: 118.02 @@ -81,7 +81,7 @@ bins: sys_res: 2.81 sys_MC: 14.05 lumi: 98.35 -- stat: 0.7580629999999999 +- stat: 59.69 sys_reco: 7.62 sys_trig: 45.72 sys_iso: 45.72 From 1b8d316516d361e0546c9aaccb818eba2a32de54 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 11 Oct 2024 15:05:53 +0100 Subject: [PATCH 17/24] set stat unc to ADD --- .../commondata/ATLAS_Z0_7TEV_LOMASS/filter.py | 12 +++++++----- .../ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py index bf07b14ca2..4fc870bcca 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/filter.py @@ -44,12 +44,14 @@ def filter_ATLAS_Z0_7TEV_LOMASS_systematics(): errors = [] for sys in systematics: + if sys[0]['name'] == 'stat': + error_definitions[sys[0]['name']] = { + "description": f"{sys[0]['name']}", + "treatment": "ADD", + "type": "UNCORR", + } - if ( - (sys[0]['name'] == 'stat') - or (sys[0]['name'] == 'sys_res') - or (sys[0]['name'] == 'sys_MC') - ): + elif (sys[0]['name'] == 'sys_res') or (sys[0]['name'] == 'sys_MC'): error_definitions[sys[0]['name']] = { "description": f"{sys[0]['name']}", "treatment": "MULT", diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml index 688f0cbe66..f3963dca27 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties.yaml @@ -1,7 +1,7 @@ definitions: stat: description: stat - treatment: MULT + treatment: ADD type: UNCORR sys_reco: description: sys_reco From 6daa0080e009ee93107f709fae4f87f42ecd5334 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 7 Dec 2024 14:37:18 +0000 Subject: [PATCH 18/24] renamed kins, override -> id, process type -> DY_MLL --- .../ATLAS_Z0_7TEV_LOMASS/filter_utils.py | 9 +-- .../ATLAS_Z0_7TEV_LOMASS/kinematics.yaml | 72 +++++++------------ .../ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 37 +++++----- 3 files changed, 41 insertions(+), 77 deletions(-) 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' From d65e2aeafbf629f3c1619bc046c620984ebf3168 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 7 Dec 2024 14:47:32 +0000 Subject: [PATCH 19/24] removed legacy version --- .../ATLAS_Z0_7TEV_LOMASS/kinematics_M.yaml | 73 --------------- .../ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 4 - .../uncertainties_legacy_M.yaml | 92 ------------------- 3 files changed, 169 deletions(-) delete mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics_M.yaml delete mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics_M.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics_M.yaml deleted file mode 100644 index 9df86c00fb..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/kinematics_M.yaml +++ /dev/null @@ -1,73 +0,0 @@ -bins: -- k1: - min: null - mid: 14.5 - max: null - k2: - min: null - mid: 210.25 - max: null - k3: - min: null - mid: 7000.0 - max: null -- k1: - min: null - mid: 19.5 - max: null - k2: - min: null - mid: 380.25 - max: null - k3: - min: null - mid: 7000.0 - max: null -- k1: - min: null - mid: 25.0 - max: null - k2: - min: null - mid: 625.0 - max: null - k3: - min: null - mid: 7000.0 - max: null -- k1: - min: null - mid: 32.0 - max: null - k2: - min: null - mid: 1024.0 - max: null - k3: - min: null - mid: 7000.0 - max: null -- k1: - min: null - mid: 41.0 - max: null - k2: - min: null - mid: 1681.0 - max: null - k3: - min: null - mid: 7000.0 - max: null -- k1: - min: null - mid: 56.0 - max: null - k2: - min: null - mid: 3136.0 - max: null - k3: - min: null - mid: 7000.0 - max: null 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 70b4df21d7..3be2658f40 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 @@ -48,9 +48,5 @@ implemented_observables: - - ATLAS_DY_7TEV_LOMASS_EXT data_uncertainties: - uncertainties.yaml - variants: - legacy: - data_uncertainties: - - uncertainties_legacy_M.yaml data_central: data.yaml ported_from: ATLASLOMASSDY11EXT diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml deleted file mode 100644 index 1069c04153..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml +++ /dev/null @@ -1,92 +0,0 @@ -definitions: - stat: - description: Uncorrelated statistical uncertainties - treatment: ADD - type: UNCORR - sys_corr_1: - description: 'Sys uncertainty idx: 1' - treatment: MULT - type: UNCORR - sys_corr_2: - description: 'Sys uncertainty idx: 2' - treatment: MULT - type: UNCORR - sys_corr_3: - description: 'Sys uncertainty idx: 3' - treatment: MULT - type: CORR - sys_corr_4: - description: 'Sys uncertainty idx: 4' - treatment: MULT - type: CORR - sys_corr_5: - description: 'Sys uncertainty idx: 5' - treatment: MULT - type: CORR - sys_corr_6: - description: 'Sys uncertainty idx: 6' - treatment: MULT - type: CORR - sys_corr_7: - description: 'Sys uncertainty idx: 7' - treatment: MULT - type: CORR - sys_corr_8: - description: 'Sys uncertainty idx: 8' - treatment: MULT - type: ATLASLUMI11 -bins: -- stat: 521.22 - sys_corr_1: 62.05 - sys_corr_2: 74.46 - sys_corr_3: 310.25 - sys_corr_4: 496.4 - sys_corr_5: 1402.33 - sys_corr_6: -372.3 - sys_corr_7: -24.82 - sys_corr_8: 434.35 -- stat: 699.67 - sys_corr_1: 67.71 - sys_corr_2: 67.71 - sys_corr_3: 315.98 - sys_corr_4: 835.09 - sys_corr_5: 2550.41 - sys_corr_6: -631.96 - sys_corr_7: 22.57 - sys_corr_8: 789.95 -- stat: 483.12 - sys_corr_1: 14.64 - sys_corr_2: 58.56 - sys_corr_3: 131.76 - sys_corr_4: 527.04 - sys_corr_5: 1244.4 - sys_corr_6: -263.52 - sys_corr_7: 0.0 - sys_corr_8: 512.4 -- stat: 269.2 - sys_corr_1: 13.46 - sys_corr_2: 26.92 - sys_corr_3: 47.11 - sys_corr_4: 242.28 - sys_corr_5: 417.26 - sys_corr_6: -107.68 - sys_corr_7: -6.73 - sys_corr_8: 235.55 -- stat: 146.12 - sys_corr_1: 2.81 - sys_corr_2: 14.05 - sys_corr_3: 19.67 - sys_corr_4: 101.16 - sys_corr_5: 118.02 - sys_corr_6: -36.53 - sys_corr_7: -2.81 - sys_corr_8: 98.35 -- stat: 59.69 - sys_corr_1: 1.27 - sys_corr_2: 6.35 - sys_corr_3: 7.62 - sys_corr_4: 45.72 - sys_corr_5: 45.72 - sys_corr_6: -8.89 - sys_corr_7: -0.0 - sys_corr_8: 44.45 From dc54ecb494b4ba22db2fc77297a87402e682fd9d Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 7 Dec 2024 14:55:23 +0000 Subject: [PATCH 20/24] added back EICC rawdata --- .../rawdata/EICC_3_20_A1c_100fb-1.txt | 20 ++++++++++++++++++ .../rawdata/EICC_NC_15GEV_EP.yaml | 21 +++++++++++++++++++ .../rawdata/EICC_5_25_A1c_100fb-1.txt | 20 ++++++++++++++++++ .../rawdata/EICC_NC_22GEV_EP.yaml | 21 +++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt create mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml create mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt create mode 100644 nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt b/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt new file mode 100644 index 0000000000..5186e33a69 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_3_20_A1c_100fb-1.txt @@ -0,0 +1,20 @@ +0.0118543 2.33943 0.0131741 +0.0147498 2.67647 0.0137443 +0.0170879 2.92672 0.0145816 +0.0193576 3.14972 0.0148745 +0.0216843 3.38092 0.0154729 +0.024134 3.61084 0.0163357 +0.026757 3.83911 0.0166505 +0.029609 4.07714 0.0173117 +0.0327378 4.32469 0.0177981 +0.036235 4.62301 0.0184076 +0.0401922 4.91469 0.0196155 +0.0447057 5.22312 0.0201606 +0.0498705 5.57079 0.0206674 +0.0559157 5.90818 0.0224443 +0.063158 6.30866 0.0235975 +0.0719283 6.76403 0.0249343 +0.082977 7.29287 0.028093 +0.098045 8.23912 0.0294843 +0.122323 9.93854 0.03264 +0.194617 15.7033 0.0412479 diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml b/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml new file mode 100644 index 0000000000..0562a740c6 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/EICC_NC_15GEV_EP/rawdata/EICC_NC_15GEV_EP.yaml @@ -0,0 +1,21 @@ +predictions_central: +- 0.011097089442581837 +- 0.09180508550690122 +- 0.15658771839531252 +- 0.21658542437898215 +- 0.2733648433555605 +- 0.32709314037346454 +- 0.3795997648037312 +- 0.43046049493249394 +- 0.4799201187391007 +- 0.5228764488739448 +- 0.5694608817943462 +- 0.6157591489415317 +- 0.6595102861408507 +- 0.7098349904876488 +- 0.7554780740416784 +- 0.8009837395209464 +- 0.8441110005347789 +- 0.8568572809328947 +- 0.8381534635862304 +- 0.6154780492789568 diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt b/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt new file mode 100644 index 0000000000..12b9a0b461 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_5_25_A1c_100fb-1.txt @@ -0,0 +1,20 @@ +0.0068164 2.35927 0.00858772 +0.00867301 2.70472 0.00918325 +0.0101997 2.9482 0.00989902 +0.0116997 3.18471 0.0105122 +0.0132466 3.41175 0.010999 +0.0148812 3.63892 0.0115985 +0.01666 3.8813 0.0119657 +0.018605 4.1459 0.01256 +0.0207568 4.43653 0.0129563 +0.0232027 4.74319 0.0135662 +0.0260104 5.05546 0.0141511 +0.0292666 5.42151 0.0149317 +0.0330757 5.86492 0.0155973 +0.0377102 6.34746 0.0165588 +0.0434833 6.871 0.0174989 +0.0507568 7.45673 0.0188441 +0.0604552 8.18451 0.0205689 +0.0743193 9.18998 0.0232922 +0.096939 10.822 0.0266716 +0.165807 17.5539 0.0342092 diff --git a/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml b/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml new file mode 100644 index 0000000000..5f704ee5f1 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/EICC_NC_22GEV_EP/rawdata/EICC_NC_22GEV_EP.yaml @@ -0,0 +1,21 @@ +predictions_central: +- 0.01690140150151845 +- 0.03799297384460928 +- 0.05710275561329077 +- 0.07762258926087376 +- 0.09932086711226819 +- 0.12242792820252063 +- 0.14721385100561526 +- 0.17330143241808899 +- 0.20034418866162207 +- 0.22955441987873032 +- 0.2623011177652174 +- 0.29644478865289314 +- 0.33054992057959237 +- 0.36998374710481025 +- 0.4157827639813768 +- 0.4692028046680297 +- 0.5282138881409599 +- 0.5929997918872923 +- 0.6562638351062493 +- 0.5928517692404429 From bac8a6e9013466e308ea7b438b7204a9c80be081 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 7 Dec 2024 17:50:53 +0000 Subject: [PATCH 21/24] added legacy back --- .../ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 4 + .../uncertainties_legacy_M.yaml | 92 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml 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 3be2658f40..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 @@ -48,5 +48,9 @@ implemented_observables: - - ATLAS_DY_7TEV_LOMASS_EXT data_uncertainties: - uncertainties.yaml + variants: + legacy: + data_uncertainties: + - uncertainties_legacy_M.yaml data_central: data.yaml ported_from: ATLASLOMASSDY11EXT diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml new file mode 100644 index 0000000000..1069c04153 --- /dev/null +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/uncertainties_legacy_M.yaml @@ -0,0 +1,92 @@ +definitions: + stat: + description: Uncorrelated statistical uncertainties + treatment: ADD + type: UNCORR + sys_corr_1: + description: 'Sys uncertainty idx: 1' + treatment: MULT + type: UNCORR + sys_corr_2: + description: 'Sys uncertainty idx: 2' + treatment: MULT + type: UNCORR + sys_corr_3: + description: 'Sys uncertainty idx: 3' + treatment: MULT + type: CORR + sys_corr_4: + description: 'Sys uncertainty idx: 4' + treatment: MULT + type: CORR + sys_corr_5: + description: 'Sys uncertainty idx: 5' + treatment: MULT + type: CORR + sys_corr_6: + description: 'Sys uncertainty idx: 6' + treatment: MULT + type: CORR + sys_corr_7: + description: 'Sys uncertainty idx: 7' + treatment: MULT + type: CORR + sys_corr_8: + description: 'Sys uncertainty idx: 8' + treatment: MULT + type: ATLASLUMI11 +bins: +- stat: 521.22 + sys_corr_1: 62.05 + sys_corr_2: 74.46 + sys_corr_3: 310.25 + sys_corr_4: 496.4 + sys_corr_5: 1402.33 + sys_corr_6: -372.3 + sys_corr_7: -24.82 + sys_corr_8: 434.35 +- stat: 699.67 + sys_corr_1: 67.71 + sys_corr_2: 67.71 + sys_corr_3: 315.98 + sys_corr_4: 835.09 + sys_corr_5: 2550.41 + sys_corr_6: -631.96 + sys_corr_7: 22.57 + sys_corr_8: 789.95 +- stat: 483.12 + sys_corr_1: 14.64 + sys_corr_2: 58.56 + sys_corr_3: 131.76 + sys_corr_4: 527.04 + sys_corr_5: 1244.4 + sys_corr_6: -263.52 + sys_corr_7: 0.0 + sys_corr_8: 512.4 +- stat: 269.2 + sys_corr_1: 13.46 + sys_corr_2: 26.92 + sys_corr_3: 47.11 + sys_corr_4: 242.28 + sys_corr_5: 417.26 + sys_corr_6: -107.68 + sys_corr_7: -6.73 + sys_corr_8: 235.55 +- stat: 146.12 + sys_corr_1: 2.81 + sys_corr_2: 14.05 + sys_corr_3: 19.67 + sys_corr_4: 101.16 + sys_corr_5: 118.02 + sys_corr_6: -36.53 + sys_corr_7: -2.81 + sys_corr_8: 98.35 +- stat: 59.69 + sys_corr_1: 1.27 + sys_corr_2: 6.35 + sys_corr_3: 7.62 + sys_corr_4: 45.72 + sys_corr_5: 45.72 + sys_corr_6: -8.89 + sys_corr_7: -0.0 + sys_corr_8: 44.45 From b7e8582e0b41d260bdb2be83a95385aab72322fb Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Wed, 15 Jan 2025 14:11:34 +0000 Subject: [PATCH 22/24] removed unused rawdata file --- .../rawdata/ATLASLOMASSDY11EXT.data | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data deleted file mode 100644 index 63381039b5..0000000000 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/rawdata/ATLASLOMASSDY11EXT.data +++ /dev/null @@ -1,16 +0,0 @@ - Mlow Mhigh y stat+ stat- sys_reco sys_trig sys_iso sys_mjet sys_pTsc sys_res sys_MC Lumi ------------------------------------------------------------------------------------------------------------------------------ - 12.0 17.0 12.41 +0.52122 -0.52122 2.5 4.0 11.3 -3.0 -0.2 0.5 0.6 3.5 - 17.0 22.0 22.57 +0.69967 -0.69967 1.4 3.7 11.3 -2.8 0.1 0.3 0.3 3.5 - 22.0 28.0 14.64 +0.48312 -0.48312 0.9 3.6 8.5 -1.8 0.0 0.1 0.4 3.5 - 28.0 36.0 6.73 +0.26920 -0.26920 0.7 3.6 6.2 -1.6 -0.1 0.2 0.4 3.5 - 36.0 46.0 2.81 +0.14612 -0.14612 0.7 3.6 4.2 -1.3 -0.1 0.1 0.5 3.5 - 46.0 66.0 1.27 +0.05969 -0.05969 0.6 3.6 3.6 -0.7 -0.0 0.1 0.5 3.5 - - -Path: /HepData/8644/d6-x1-y1 -Born-level fiducial differential cross section dsigma/dm_ll [pb/GeV], with statistical, systematic and Lumi uncertainties -Location: Table 6-7, Page 22 of preprint -RE : P P --> MU+ MU- X -SQRT(S) : 7000.0 GeV - From 0d964c9ad9de712904ff62a87805e3a31f31d8bf Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 21 Jan 2025 17:23:10 +0000 Subject: [PATCH 23/24] changed mass label and description --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 70b4df21d7..8fb9aa05dd 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 @@ -33,8 +33,8 @@ implemented_observables: kinematics: variables: m_ll: - description: squared mass - label: m_ll + description: dilepton mass + label: '$m_{ll}$' units: 'GeV' sqrts: description: center of mass energy From 7ed18586b7854fae8cf53b4cd10d36f58c496b21 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Wed, 22 Jan 2025 17:57:07 +0000 Subject: [PATCH 24/24] updated metadata url and version --- .../nnpdf_data/commondata/ATLAS_Z0_7TEV_LOMASS/metadata.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 8fb9aa05dd..94ff3b421e 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 @@ -10,8 +10,8 @@ arXiv: iNSPIRE: url: 'https://inspirehep.net/literature/1288706' hepdata: - url: 10.17182/hepdata.64183.v1/t6 - version: -1 + url: 'https://www.hepdata.net/record/ins1288706' + version: 1 implemented_observables: - observable_name: M observable: