Reimplement ATLAS_Z0_7TEV_49FB_HIMASS

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)

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

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

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",
 }