adding KIN_LABEL

NNPDF · Nov 8, 2024 · 1a68711 · 1a68711
1 parent ac81dc9
commit 1a68711
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 49 deletions.
diff --git a/nnpdf_data/nnpdf_data/commondata/D0_Z0_1P96TEV/metadata.yaml b/nnpdf_data/nnpdf_data/commondata/D0_Z0_1P96TEV/metadata.yaml
@@ -13,50 +13,50 @@ hepdata:
   url: https://www.hepdata.net/record/ins744624
   version: 1
 implemented_observables:
-- observable_name: ZRAP
-  observable:
-    description: Drell-Yan Rapidity Distribution
-    label: D0 $Z$ rapidity
-    units: ''
-  process_type: DY_Z_Y
-  tables: [1]
-  npoints: []
-  ndata: 28
-  plotting:
-    kinematics_override: identity
-    dataset_label: D0 $Z$ rapidity
-    y_label: $1/\sigma\;d\sigma_{Z/\gamma^{*}}/dy$
-    plot_x: y
-  kinematic_coverage:
-  - y
-  - m_Z2
-  - sqrts
-  kinematics:
-    variables:
-      abs_eta:
-        description: "Boson absolute rapidity"
-        label: $|y|$
-        units: ""
-      m_Z2:
-        description: "Z mass squared"
-        label: $M_Z^2$
-        units: $GeV^2$
-      sqrts:
-        description: "Center of mass energy"
-        label: $\sqrt{s}$
-        units: $GeV$
-    file: kinematics_ZRAP.yaml
-  theory:
-    conversion_factor: 1.0
-    operation: RATIO
-    FK_tables:
-    - - D0ZRAP-D0_ZRAP_MCgrid_500M
-    - - D0ZRAP-D0_ZNORM_MCgrid_500M
-  data_uncertainties:
-    - uncertainties_ZRAP.yaml
-  variants:
-    legacy:
-      data_uncertainties:
-      - uncertainties_legacy_ZRAP.yaml
-  data_central: data_ZRAP.yaml
-  ported_from: D0ZRAP_40
+  - observable_name: ZRAP
+    observable:
+      description: Drell-Yan Rapidity Distribution
+      label: D0 $Z$ rapidity
+      units: ''
+    process_type: DY_Z_Y
+    tables: [1]
+    npoints: []
+    ndata: 28
+    plotting:
+      kinematics_override: identity
+      dataset_label: D0 $Z$ rapidity
+      y_label: $1/\sigma\;d\sigma_{Z/\gamma^{*}}/dy$
+      plot_x: y
+    kinematic_coverage:
+    - y
+    - m_Z2
+    - sqrts
+    kinematics:
+      variables:
+        y:
+          description: "Boson absolute rapidity"
+          label: $|y|$
+          units: ""
+        m_Z2:
+          description: "Z mass squared"
+          label: $M_Z^2$
+          units: $GeV^2$
+        sqrts:
+          description: "Center of mass energy"
+          label: $\sqrt{s}$
+          units: $GeV$
+      file: kinematics_ZRAP.yaml
+    theory:
+      conversion_factor: 1.0
+      operation: RATIO
+      FK_tables:
+      - - D0ZRAP-D0_ZRAP_MCgrid_500M
+      - - D0ZRAP-D0_ZNORM_MCgrid_500M
+    data_uncertainties:
+      - uncertainties_ZRAP.yaml
+    variants:
+      legacy:
+        data_uncertainties:
+        - uncertainties_legacy_ZRAP.yaml
+    data_central: data_ZRAP.yaml
+    ported_from: D0ZRAP_40
diff --git a/validphys2/src/validphys/commondataparser.py b/validphys2/src/validphys/commondataparser.py
@@ -112,6 +112,8 @@ 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_Z_Y": ("$y_Z$", "$\\M^2 (GeV^2)$", "$\\sqrt{s} (GeV)$"),
+    "DY_W_ETA": ("$\\eta$", "$\\M^2 (GeV^2)$", "$\\sqrt{s} (GeV)$"),
 }
 
 PROCESS_DESCRIPTION_LABEL = {

diff --git a/validphys2/src/validphys/process_options.py b/validphys2/src/validphys/process_options.py
@@ -234,7 +234,7 @@ def _dyboson_xq2map(kin_info):
     originating from a W boson DY process.
     """
     mass2 = kin_info.get_one_of(_Vars.m_W2, _Vars.m_Z2)
-    eta = kin_info.get_one_of(_Vars.eta, _Vars.y)
+    eta = kin_info.get_one_of(_Vars.eta, _Vars.y, _Vars.abs_eta)
     sqrts = kin_info[_Vars.sqrts]
 
     # eta = y for massless particles
@@ -351,7 +351,7 @@ def _dybosonpt_xq2map(kin_dict):
 DY_2L = _Process(
     "DY_2L",
     "DY W or Z -> 2 leptons ",
-    accepted_variables=(_Vars.y, _Vars.eta, _Vars.m_W2, _Vars.m_Z2, _Vars.sqrts),
+    accepted_variables=(_Vars.y, _Vars.eta, _Vars.m_W2, _Vars.m_Z2, _Vars.sqrts, _Vars.abs_eta),
     xq2map_function=_dyboson_xq2map,
 )