From b20b500dac8795ac86ace22c7c798449deef3def Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sun, 8 Dec 2024 12:15:42 +0000 Subject: [PATCH] added DY_Z_Y process type, changed name of kinematics, identity for kin override --- .../commondata/ATLAS_Z0_8TEV_HIMASS/filter.py | 2 +- .../ATLAS_Z0_8TEV_HIMASS/filter_utils.py | 10 +- .../ATLAS_Z0_8TEV_HIMASS/kinematics.yaml | 192 +++++++++--------- .../ATLAS_Z0_8TEV_HIMASS/metadata.yaml | 28 +-- .../ATLAS_Z0_8TEV_HIMASS/uncertainties.yaml | 2 +- validphys2/src/validphys/process_options.py | 4 +- 6 files changed, 119 insertions(+), 119 deletions(-) diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter.py index 6d71a56947..10f352e430 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter.py @@ -57,7 +57,7 @@ def filter_ATLAS_Z0_8TEV_HIMASS_systematics(): error_definitions["ATLASLUMI12"] = { "description": f"ATLASLUMI12", "treatment": "MULT", - "type": "SPECIAL", + "type": "ATLASLUMI12", } else: diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter_utils.py b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter_utils.py index cab30c18d8..2a6f71a5dd 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter_utils.py +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/filter_utils.py @@ -22,15 +22,15 @@ def get_kinematics(): ): kin_value = { - 'y': { + 'abs_y': { 'min': indep_var1['low'], 'mid': 0.5 * (indep_var1['low'] + indep_var1['high']), 'max': indep_var1['high'], }, - 'M2': { - 'min': indep_var2['low'] ** 2, - 'mid': (0.5 * (indep_var2['low'] + indep_var2['high'])) ** 2, - 'max': indep_var2['high'] ** 2, + 'm_ll2': { + 'min': indep_var2['low']**2, + 'mid': (0.5 * (indep_var2['low'] + indep_var2['high']))**2, + 'max': indep_var2['high']**2, }, 'sqrts': {'min': None, 'mid': 8000.0, 'max': None}, } diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/kinematics.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/kinematics.yaml index 2557f736fb..22726cbb77 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/kinematics.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/kinematics.yaml @@ -1,9 +1,9 @@ bins: -- y: +- abs_y: min: 0.0 mid: 0.1 max: 0.2 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -11,11 +11,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.2 mid: 3.00000000e-01 max: 0.4 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -23,11 +23,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.4 mid: 0.5 max: 0.6 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -35,11 +35,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.6 mid: 0.7 max: 0.8 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -47,11 +47,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.8 mid: 0.9 max: 1.0 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -59,11 +59,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.0 mid: 1.1 max: 1.2 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -71,11 +71,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.2 mid: 1.30000000e+00 max: 1.4 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -83,11 +83,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.4 mid: 1.5 max: 1.6 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -95,11 +95,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.6 mid: 1.70000000e+00 max: 1.8 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -107,11 +107,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.8 mid: 1.9 max: 2.0 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -119,11 +119,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.0 mid: 2.1 max: 2.2 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -131,11 +131,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.2 mid: 2.3 max: 2.4 - M2: + m_ll2: min: 13456.0 mid: 17689.0 max: 22500.0 @@ -143,11 +143,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.0 mid: 0.1 max: 0.2 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -155,11 +155,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.2 mid: 3.00000000e-01 max: 0.4 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -167,11 +167,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.4 mid: 0.5 max: 0.6 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -179,11 +179,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.6 mid: 0.7 max: 0.8 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -191,11 +191,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.8 mid: 0.9 max: 1.0 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -203,11 +203,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.0 mid: 1.1 max: 1.2 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -215,11 +215,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.2 mid: 1.30000000e+00 max: 1.4 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -227,11 +227,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.4 mid: 1.5 max: 1.6 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -239,11 +239,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.6 mid: 1.70000000e+00 max: 1.8 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -251,11 +251,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.8 mid: 1.9 max: 2.0 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -263,11 +263,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.0 mid: 2.1 max: 2.2 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -275,11 +275,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.2 mid: 2.3 max: 2.4 - M2: + m_ll2: min: 22500.0 mid: 30625.0 max: 40000.0 @@ -287,11 +287,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.0 mid: 0.1 max: 0.2 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -299,11 +299,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.2 mid: 3.00000000e-01 max: 0.4 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -311,11 +311,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.4 mid: 0.5 max: 0.6 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -323,11 +323,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.6 mid: 0.7 max: 0.8 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -335,11 +335,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.8 mid: 0.9 max: 1.0 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -347,11 +347,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.0 mid: 1.1 max: 1.2 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -359,11 +359,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.2 mid: 1.30000000e+00 max: 1.4 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -371,11 +371,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.4 mid: 1.5 max: 1.6 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -383,11 +383,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.6 mid: 1.70000000e+00 max: 1.8 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -395,11 +395,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.8 mid: 1.9 max: 2.0 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -407,11 +407,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.0 mid: 2.1 max: 2.2 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -419,11 +419,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.2 mid: 2.3 max: 2.4 - M2: + m_ll2: min: 40000.0 mid: 62500.0 max: 90000.0 @@ -431,11 +431,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.0 mid: 0.2 max: 0.4 - M2: + m_ll2: min: 90000.0 mid: 160000.0 max: 250000.0 @@ -443,11 +443,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.4 mid: 6.00000000e-01 max: 0.8 - M2: + m_ll2: min: 90000.0 mid: 160000.0 max: 250000.0 @@ -455,11 +455,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.8 mid: 1.0 max: 1.2 - M2: + m_ll2: min: 90000.0 mid: 160000.0 max: 250000.0 @@ -467,11 +467,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.2 mid: 1.4 max: 1.6 - M2: + m_ll2: min: 90000.0 mid: 160000.0 max: 250000.0 @@ -479,11 +479,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.6 mid: 1.8 max: 2.0 - M2: + m_ll2: min: 90000.0 mid: 160000.0 max: 250000.0 @@ -491,11 +491,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.0 mid: 2.2 max: 2.4 - M2: + m_ll2: min: 90000.0 mid: 160000.0 max: 250000.0 @@ -503,11 +503,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.0 mid: 0.2 max: 0.4 - M2: + m_ll2: min: 250000.0 mid: 1.00000000e+06 max: 2.25000000e+06 @@ -515,11 +515,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.4 mid: 6.00000000e-01 max: 0.8 - M2: + m_ll2: min: 250000.0 mid: 1.00000000e+06 max: 2.25000000e+06 @@ -527,11 +527,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 0.8 mid: 1.0 max: 1.2 - M2: + m_ll2: min: 250000.0 mid: 1.00000000e+06 max: 2.25000000e+06 @@ -539,11 +539,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.2 mid: 1.4 max: 1.6 - M2: + m_ll2: min: 250000.0 mid: 1.00000000e+06 max: 2.25000000e+06 @@ -551,11 +551,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 1.6 mid: 1.8 max: 2.0 - M2: + m_ll2: min: 250000.0 mid: 1.00000000e+06 max: 2.25000000e+06 @@ -563,11 +563,11 @@ bins: min: null mid: 8000.0 max: null -- y: +- abs_y: min: 2.0 mid: 2.2 max: 2.4 - M2: + m_ll2: min: 250000.0 mid: 1.00000000e+06 max: 2.25000000e+06 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/metadata.yaml index a631b7260f..562acc913e 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/metadata.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/metadata.yaml @@ -1,6 +1,6 @@ setname: ATLAS_Z0_8TEV_HIMASS version: 1 -version_comment: Port of old commondata +version_comment: "New implementation of the ATLAS 8 TeV high mass Z0 data" nnpdf_metadata: nnpdf31_process: DY NC experiment: ATLAS @@ -18,36 +18,36 @@ implemented_observables: description: Drell-Yan Rapidity Distribution label: ATLAS DY 2D 8 TeV high mass units: '' - process_type: EWK_RAP + process_type: DY_Z_Y tables: [2] - npoints: [] + npoints: [48] ndata: 48 plotting: - kinematics_override: ewk_rap_sqrt_scale + kinematics_override: identity dataset_label: ATLAS DY 2D 8 TeV high mass y_label: $d^2\sigma/dm_{\ell\ell}d|y_{\ell\ell}|$ (pb) figure_by: - - y + - m_ll2 x_label: $|y_{\ell\ell}|$ - plot_x: y + plot_x: abs_y kinematic_coverage: - - y - - M2 + - abs_y + - m_ll2 - sqrts kinematics: variables: - y: + abs_y: description: Absolute rapidity of the dilepton system - label: y + label: '$|y_{ll}|$' units: '' - M2: + m_ll2: description: Invariant mass of the dilepton system - label: M2 - units: '' + label: '$m_{ll}^2$' + units: '$GeV^2$' sqrts: description: Center of mass energy label: sqrts - units: '' + units: 'GeV' file: kinematics.yaml theory: conversion_factor: 1.0 diff --git a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/uncertainties.yaml b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/uncertainties.yaml index 14129f8c8e..2bcd78ffeb 100644 --- a/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/uncertainties.yaml +++ b/nnpdf_data/nnpdf_data/commondata/ATLAS_Z0_8TEV_HIMASS/uncertainties.yaml @@ -150,7 +150,7 @@ definitions: ATLASLUMI12: description: ATLASLUMI12 treatment: MULT - type: SPECIAL + type: ATLASLUMI12 bins: - stat: 2.25828000e-02 sys,unc: 5.57600000e-03 diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py index 8e08ff57bf..8a7f932467 100644 --- a/validphys2/src/validphys/process_options.py +++ b/validphys2/src/validphys/process_options.py @@ -250,8 +250,8 @@ def _dyboson_xq2map(kin_info): Computes x and q2 mapping for pseudo rapidity observables originating from a W boson DY process. """ - mass2 = kin_info.get_one_of(_Vars.m_W2, _Vars.m_Z2, _Vars.m_V2) - eta = kin_info.get_one_of(_Vars.eta, _Vars.y, _Vars.abs_eta) + mass2 = kin_info.get_one_of(_Vars.m_W2, _Vars.m_Z2, _Vars.m_V2, _Vars.m_ll2) + eta = kin_info.get_one_of(_Vars.eta, _Vars.y, _Vars.abs_eta, _Vars.abs_y) sqrts = kin_info[_Vars.sqrts] # eta = y for massless particles