nnpdf-data 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

nnpdf_data/__init__.py

@@ -2,7 +2,7 @@ import pathlib
 
 from ._version import __version__
 from .commondataparser import parse_new_metadata
-from .validphys_compatibility import legacy_to_new_map, legacy_to_new_mapping, new_to_legacy_map
+from .validphys_compatibility import legacy_to_new_map
 
 path_vpdata = pathlib.Path(__file__).parent
 path_commondata = path_vpdata / "commondata"
@@ -11,7 +11,6 @@ theory_cards = path_vpdata / "theory_cards"
 
 def load_dataset_metadata(dataset_name, variant=None):
     """Given a dataset name, return the metadata"""
-
     # Compatibility with old nnpdf names, these two lines
     # might disappear at any given point
     if variant is None:

nnpdf_data/_version.py

@@ -1 +1 @@
-__version__ = "0.0.2"
+__version__ = "0.0.3"

nnpdf_data/commondata/ATHENA_NC_105GEV_EP/metadata.yaml

@@ -17,38 +17,37 @@ nnpdf_metadata:
   experiment: "EIC"
 
 implemented_observables:
-  - observable_name: "ALL"
-    observable:
-      description: "EIC projection measurements on polarized ep scattering at 105GeV at ATHENA"
-      label: "$A_{LL}$"
-      units: ""
-    process_type: "DIS_POL"
-    ndata: 123
-    tables: []
-    npoints: [] # number of datapoints in each table
+- observable_name: "ALL"
+  observable:
+    description: "EIC projection measurements on polarized ep scattering at 105GeV at ATHENA"
+    label: "$A_{LL}$"
+    units: ""
+  process_type: "DIS_POL"
+  ndata: 123
+  tables: []
+  npoints: []   # number of datapoints in each table
 
     # Plotting information
-    plotting:
-      kinematics_override: dis_sqrt_scale
-      dataset_label: "ATHENA 105GeV (ALL)"
-      plot_x: x
-      line_by: [Q2]
-      figure_by: []
-      y_label: "$A_{LL}^{p}(x, Q^2)$"
-    kinematic_coverage: [x, Q2, y]
-
-    kinematics:
-      variables:
-        x: { description: "momentum fraction", label: "$x$", units: "" }
-        Q2: { description: "virtuality", label: "$Q^2$", units: "$GeV^2$" }
-        y: { description: "inelasticity", label: "$y$", units: "" }
-      file: kinematics.yaml
-
-    data_central: data.yaml
-    data_uncertainties:
-      - uncertainties.yaml
-
-    theory:
-      FK_tables:
-        - - ATHENA_NC_105GEV_EP_G1
-      operation: "null"
+  plotting:
+    dataset_label: "ATHENA 105GeV (ALL)"
+    plot_x: x
+    line_by: [Q2]
+    figure_by: []
+    y_label: "$A_{LL}^{p}(x, Q^2)$"
+  kinematic_coverage: [x, Q2, y]
+
+  kinematics:
+    variables:
+      x: {description: "momentum fraction", label: "$x$", units: ""}
+      Q2: {description: "virtuality", label: "$Q^2$", units: "$GeV^2$"}
+      y: {description: "inelasticity", label: "$y$", units: ""}
+    file: kinematics.yaml
+
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties.yaml
+
+  theory:
+    FK_tables:
+    - - ATHENA_NC_105GEV_EP_G1
+    operation: "null"

nnpdf_data/commondata/ATHENA_NC_140GEV_EP/metadata.yaml

@@ -17,38 +17,37 @@ nnpdf_metadata:
   experiment: "EIC"
 
 implemented_observables:
-  - observable_name: "ALL"
-    observable:
-      description: "EIC projection measurements on polarized ep scattering at 140GeV at ATHENA"
-      label: "$A_{LL}$"
-      units: ""
-    process_type: "DIS_POL"
-    ndata: 131
-    tables: []
-    npoints: [] # number of datapoints in each table
+- observable_name: "ALL"
+  observable:
+    description: "EIC projection measurements on polarized ep scattering at 140GeV at ATHENA"
+    label: "$A_{LL}$"
+    units: ""
+  process_type: "DIS_POL"
+  ndata: 131
+  tables: []
+  npoints: []   # number of datapoints in each table
 
     # Plotting information
-    plotting:
-      kinematics_override: dis_sqrt_scale
-      dataset_label: "ATHENA 140GeV (ALL)"
-      plot_x: x
-      line_by: [Q2]
-      figure_by: []
-      y_label: "$A_{LL}^{p}(x, Q^2)$"
-    kinematic_coverage: [x, Q2, y]
-
-    kinematics:
-      variables:
-        x: { description: "momentum fraction", label: "$x$", units: "" }
-        Q2: { description: "virtuality", label: "$Q^2$", units: "$GeV^2$" }
-        y: { description: "inelasticity", label: "$y$", units: "" }
-      file: kinematics.yaml
-
-    data_central: data.yaml
-    data_uncertainties:
-      - uncertainties.yaml
-
-    theory:
-      FK_tables:
-        - - ATHENA_NC_140GEV_EP_G1
-      operation: "null"
+  plotting:
+    dataset_label: "ATHENA 140GeV (ALL)"
+    plot_x: x
+    line_by: [Q2]
+    figure_by: []
+    y_label: "$A_{LL}^{p}(x, Q^2)$"
+  kinematic_coverage: [x, Q2, y]
+
+  kinematics:
+    variables:
+      x: {description: "momentum fraction", label: "$x$", units: ""}
+      Q2: {description: "virtuality", label: "$Q^2$", units: "$GeV^2$"}
+      y: {description: "inelasticity", label: "$y$", units: ""}
+    file: kinematics.yaml
+
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties.yaml
+
+  theory:
+    FK_tables:
+    - - ATHENA_NC_140GEV_EP_G1
+    operation: "null"

nnpdf_data/commondata/ATHENA_NC_29GEV_EP/metadata.yaml

@@ -17,38 +17,37 @@ nnpdf_metadata:
   experiment: "EIC"
 
 implemented_observables:
-  - observable_name: "ALL"
-    observable:
-      description: "EIC projection measurements on polarized ep scattering at 29GeV at ATHENA"
-      label: "$A_{LL}$"
-      units: ""
-    process_type: "DIS_POL"
-    ndata: 76
-    tables: []
-    npoints: [] # number of datapoints in each table
+- observable_name: "ALL"
+  observable:
+    description: "EIC projection measurements on polarized ep scattering at 29GeV at ATHENA"
+    label: "$A_{LL}$"
+    units: ""
+  process_type: "DIS_POL"
+  ndata: 76
+  tables: []
+  npoints: []   # number of datapoints in each table
 
     # Plotting information
-    plotting:
-      kinematics_override: dis_sqrt_scale
-      dataset_label: "ATHENA 29GeV (ALL)"
-      plot_x: x
-      line_by: [Q2]
-      figure_by: []
-      y_label: "$A_{LL}^{p}(x, Q^2)$"
-    kinematic_coverage: [x, Q2, y]
-
-    kinematics:
-      variables:
-        x: { description: "momentum fraction", label: "$x$", units: "" }
-        Q2: { description: "virtuality", label: "$Q^2$", units: "$GeV^2$" }
-        y: { description: "inelasticity", label: "$y$", units: "" }
-      file: kinematics.yaml
-
-    data_central: data.yaml
-    data_uncertainties:
-      - uncertainties.yaml
-
-    theory:
-      FK_tables:
-        - - ATHENA_NC_29GEV_EP_G1
-      operation: "null"
+  plotting:
+    dataset_label: "ATHENA 29GeV (ALL)"
+    plot_x: x
+    line_by: [Q2]
+    figure_by: []
+    y_label: "$A_{LL}^{p}(x, Q^2)$"
+  kinematic_coverage: [x, Q2, y]
+
+  kinematics:
+    variables:
+      x: {description: "momentum fraction", label: "$x$", units: ""}
+      Q2: {description: "virtuality", label: "$Q^2$", units: "$GeV^2$"}
+      y: {description: "inelasticity", label: "$y$", units: ""}
+    file: kinematics.yaml
+
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties.yaml
+
+  theory:
+    FK_tables:
+    - - ATHENA_NC_29GEV_EP_G1
+    operation: "null"

nnpdf_data/commondata/ATHENA_NC_45GEV_EP/metadata.yaml

@@ -17,38 +17,37 @@ nnpdf_metadata:
   experiment: "EIC"
 
 implemented_observables:
-  - observable_name: "ALL"
-    observable:
-      description: "EIC projection measurements on polarized ep scattering at 45GeV at ATHENA"
-      label: "$A_{LL}$"
-      units: ""
-    process_type: "DIS_POL"
-    ndata: 92
-    tables: []
-    npoints: [] # number of datapoints in each table
+- observable_name: "ALL"
+  observable:
+    description: "EIC projection measurements on polarized ep scattering at 45GeV at ATHENA"
+    label: "$A_{LL}$"
+    units: ""
+  process_type: "DIS_POL"
+  ndata: 92
+  tables: []
+  npoints: []   # number of datapoints in each table
 
     # Plotting information
-    plotting:
-      kinematics_override: dis_sqrt_scale
-      dataset_label: "ATHENA 45GeV (ALL)"
-      plot_x: x
-      line_by: [Q2]
-      figure_by: []
-      y_label: "$A_{LL}^{p}(x, Q^2)$"
-    kinematic_coverage: [x, Q2, y]
-
-    kinematics:
-      variables:
-        x: { description: "momentum fraction", label: "$x$", units: "" }
-        Q2: { description: "virtuality", label: "$Q^2$", units: "$GeV^2$" }
-        y: { description: "inelasticity", label: "$y$", units: "" }
-      file: kinematics.yaml
-
-    data_central: data.yaml
-    data_uncertainties:
-      - uncertainties.yaml
-
-    theory:
-      FK_tables:
-        - - ATHENA_NC_45GEV_EP_G1
-      operation: "null"
+  plotting:
+    dataset_label: "ATHENA 45GeV (ALL)"
+    plot_x: x
+    line_by: [Q2]
+    figure_by: []
+    y_label: "$A_{LL}^{p}(x, Q^2)$"
+  kinematic_coverage: [x, Q2, y]
+
+  kinematics:
+    variables:
+      x: {description: "momentum fraction", label: "$x$", units: ""}
+      Q2: {description: "virtuality", label: "$Q^2$", units: "$GeV^2$"}
+      y: {description: "inelasticity", label: "$y$", units: ""}
+    file: kinematics.yaml
+
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties.yaml
+
+  theory:
+    FK_tables:
+    - - ATHENA_NC_45GEV_EP_G1
+    operation: "null"

nnpdf_data/commondata/ATHENA_NC_63GEV_EP/metadata.yaml

@@ -17,38 +17,37 @@ nnpdf_metadata:
   experiment: "EIC"
 
 implemented_observables:
-  - observable_name: "ALL"
-    observable:
-      description: "EIC projection measurements on polarized ep scattering at 63GeV at ATHENA"
-      label: "$A_{LL}$"
-      units: ""
-    process_type: "DIS_POL"
-    ndata: 91
-    tables: []
-    npoints: [] # number of datapoints in each table
+- observable_name: "ALL"
+  observable:
+    description: "EIC projection measurements on polarized ep scattering at 63GeV at ATHENA"
+    label: "$A_{LL}$"
+    units: ""
+  process_type: "DIS_POL"
+  ndata: 91
+  tables: []
+  npoints: []   # number of datapoints in each table
 
     # Plotting information
-    plotting:
-      kinematics_override: dis_sqrt_scale
-      dataset_label: "ATHENA 63GeV (ALL)"
-      plot_x: x
-      line_by: [Q2]
-      figure_by: []
-      y_label: "$A_{LL}^{p}(x, Q^2)$"
-    kinematic_coverage: [x, Q2, y]
-
-    kinematics:
-      variables:
-        x: { description: "momentum fraction", label: "$x$", units: "" }
-        Q2: { description: "virtuality", label: "$Q^2$", units: "$GeV^2$" }
-        y: { description: "inelasticity", label: "$y$", units: "" }
-      file: kinematics.yaml
-
-    data_central: data.yaml
-    data_uncertainties:
-      - uncertainties.yaml
-
-    theory:
-      FK_tables:
-        - - ATHENA_NC_63GEV_EP_G1
-      operation: "null"
+  plotting:
+    dataset_label: "ATHENA 63GeV (ALL)"
+    plot_x: x
+    line_by: [Q2]
+    figure_by: []
+    y_label: "$A_{LL}^{p}(x, Q^2)$"
+  kinematic_coverage: [x, Q2, y]
+
+  kinematics:
+    variables:
+      x: {description: "momentum fraction", label: "$x$", units: ""}
+      Q2: {description: "virtuality", label: "$Q^2$", units: "$GeV^2$"}
+      y: {description: "inelasticity", label: "$y$", units: ""}
+    file: kinematics.yaml
+
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties.yaml
+
+  theory:
+    FK_tables:
+    - - ATHENA_NC_63GEV_EP_G1
+    operation: "null"

nnpdf_data/commondata/ATLAS_1JET_13TEV_DIF/metadata.yaml

@@ -18,78 +18,76 @@ version_comment: "Separated luminosity uncertainty"
 
 implemented_observables:
 
-  - observable: {description: "double differential cross section w.r.t. pT and y", label: '$\frac{d^2\sigma}{dp_T d|y|}$', units: "$pb/GeV$"}
-    observable_name: PT-Y
-    process_type: JET
-    ndata: 177 # 33+32+31+31+28+22
-    tables: [1, 2, 3, 4, 5, 6]
-    kinematics:
-      variables:
-        y: {description: "jet absolute rapidity", label: "$|y|$", units: ""}
-        pT: {description: "jet transverse momentum", label: "$p_T$", units: "$GeV$"}
-        sqrts: {description: "center of mass energy", label: '$\sqrt{s}$', units: "$GeV$"}
-      file: kinematics.yaml
-    data_central: data.yaml
-    data_uncertainties:
+- observable: {description: "double differential cross section w.r.t. pT and y", label: '$\frac{d^2\sigma}{dp_T d|y|}$', units: "$pb/GeV$"}
+  observable_name: PT-Y
+  process_type: JET
+  ndata: 177   # 33+32+31+31+28+22
+  tables: [1, 2, 3, 4, 5, 6]
+  kinematics:
+    variables:
+      y: {description: "jet absolute rapidity", label: "$|y|$", units: ""}
+      pT: {description: "jet transverse momentum", label: "$p_T$", units: "$GeV$"}
+      sqrts: {description: "center of mass energy", label: '$\sqrt{s}$', units: "$GeV$"}
+    file: kinematics.yaml
+  data_central: data.yaml
+  data_uncertainties:
+  - uncertainties_wo-lumi.yaml
+  - uncertainties_lumi.yaml
+  kinematic_coverage: [y, pT, sqrts]
+  plotting:
+    x_scale: log
+    dataset_label: 'ATLAS Jet 13 TeV: $\frac{d^2\sigma}{dp_T d|y|}$'
+    plot_x: pT
+    y_label: '$\frac{d^2\sigma}{dp_T d|y|}$ ($\frac{pb}{GeV}$)'
+    figure_by:
+    - y
+  theory:
+    FK_tables:
+    - - ATLAS_1JET_13TEV_DIF_PT-Y_BIN1
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN2
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN3
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN4
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN5
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN6
+    operation: 'null'
+  variants:
+    wo-lumi:
+      data_uncertainties:
       - uncertainties_wo-lumi.yaml
-      - uncertainties_lumi.yaml
-    kinematic_coverage: [y, pT, sqrts]
-    plotting:
-      kinematics_override: identity
-      x_scale: log
-      dataset_label: 'ATLAS Jet 13 TeV: $\frac{d^2\sigma}{dp_T d|y|}$'
-      plot_x: pT
-      y_label: '$\frac{d^2\sigma}{dp_T d|y|}$ ($\frac{pb}{GeV}$)'
-      figure_by:
-        - y
-    theory:
-      FK_tables:
-        - - ATLAS_1JET_13TEV_DIF_PT-Y_BIN1
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN2
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN3
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN4
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN5
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN6
-      operation: 'null'
-    variants:
-      wo-lumi:
-        data_uncertainties:
-          - uncertainties_wo-lumi.yaml
 
-  - observable: {description: "double differential cross section w.r.t. pT and y - altcorr1", label: '$\frac{d^2\sigma}{dp_T d|y|}$', units: "$pb/GeV$"}
-    observable_name: PT-Y-ALTCORR1
-    process_type: JET
-    ndata: 177 # 33+32+31+31+28+22
-    tables: [1, 2, 3, 4, 5, 6]
-    kinematics:
-      variables:
-        y: {description: "jet absolute rapidity", label: "$|y|$", units: ""}
-        pT: {description: "jet transverse momentum", label: "$p_T$", units: "$GeV$"}
-        sqrts: {description: "center of mass energy", label: '$\sqrt{s}$', units: "$GeV$"}
-      file: kinematics_altcorr1.yaml
-    data_central: data_altcorr1.yaml
-    data_uncertainties:
+- observable: {description: "double differential cross section w.r.t. pT and y - altcorr1", label: '$\frac{d^2\sigma}{dp_T d|y|}$', units: "$pb/GeV$"}
+  observable_name: PT-Y-ALTCORR1
+  process_type: JET
+  ndata: 177   # 33+32+31+31+28+22
+  tables: [1, 2, 3, 4, 5, 6]
+  kinematics:
+    variables:
+      y: {description: "jet absolute rapidity", label: "$|y|$", units: ""}
+      pT: {description: "jet transverse momentum", label: "$p_T$", units: "$GeV$"}
+      sqrts: {description: "center of mass energy", label: '$\sqrt{s}$', units: "$GeV$"}
+    file: kinematics_altcorr1.yaml
+  data_central: data_altcorr1.yaml
+  data_uncertainties:
+  - uncertainties_altcorr1_wo-lumi.yaml
+  - uncertainties_altcorr1_lumi.yaml
+  kinematic_coverage: [y, pT, sqrts]
+  plotting:
+    x_scale: log
+    dataset_label: 'ATLAS Jet 13 TeV: $\frac{d^2\sigma}{dp_T d|y|}$'
+    plot_x: pT
+    y_label: '$\frac{d^2\sigma}{dp_T d|y|}$ ($\frac{pb}{GeV}$)'
+    figure_by:
+    - y
+  theory:
+    FK_tables:
+    - - ATLAS_1JET_13TEV_DIF_PT-Y_BIN1
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN2
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN3
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN4
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN5
+      - ATLAS_1JET_13TEV_DIF_PT-Y_BIN6
+    operation: 'null'
+  variants:
+    wo-lumi:
+      data_uncertainties:
       - uncertainties_altcorr1_wo-lumi.yaml
-      - uncertainties_altcorr1_lumi.yaml
-    kinematic_coverage: [y, pT, sqrts]
-    plotting:
-      kinematics_override: identity
-      x_scale: log
-      dataset_label: 'ATLAS Jet 13 TeV: $\frac{d^2\sigma}{dp_T d|y|}$'
-      plot_x: pT
-      y_label: '$\frac{d^2\sigma}{dp_T d|y|}$ ($\frac{pb}{GeV}$)'
-      figure_by:
-        - y
-    theory:
-      FK_tables:
-        - - ATLAS_1JET_13TEV_DIF_PT-Y_BIN1
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN2
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN3
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN4
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN5
-          - ATLAS_1JET_13TEV_DIF_PT-Y_BIN6
-      operation: 'null'
-    variants:
-      wo-lumi:
-        data_uncertainties:
-          - uncertainties_altcorr1_wo-lumi.yaml

nnpdf_data/commondata/ATLAS_1JET_13TEV_DIF/uncertainties_altcorr1_lumi.yaml

@@ -2,7 +2,7 @@ definitions:
   syst_lumi:
     description: ''
     treatment: MULT
-    type: CORR
+    type: ATLASLUMI15
 bins:
 - syst_lumi: 249.59
 - syst_lumi: 120.963

nnpdf_data/commondata/ATLAS_1JET_13TEV_DIF/uncertainties_lumi.yaml

@@ -2,7 +2,7 @@ definitions:
   syst_lumi:
     description: ''
     treatment: MULT
-    type: CORR
+    type: ATLASLUMI15
 bins:
 - syst_lumi: 249.59
 - syst_lumi: 120.963

nnpdf_data/commondata/ATLAS_1JET_8TEV_R06/metadata.yaml

@@ -21,8 +21,7 @@ nnpdf_metadata:
 implemented_observables:
 - observable_name: PTY
   observable:
-    description: Double-differential inclusive jet cross-section as functions of jet
-      transverse momentum and the absolute jet rapidity.
+    description: Double-differential inclusive jet cross-section as functions of jet transverse momentum and the absolute jet rapidity.
     label: r"$10^{3*qbin} d^2\sigma/dp_Td|y|$"
     units: '[pb/GeV]'
   ndata: 171
@@ -36,7 +35,6 @@ implemented_observables:
   process_type: JET
   plotting:
     dataset_label: ATLAS jets 8 TeV, R=0.6
-    kinematics_override: identity
     x_scale: log
     plot_x: pT
     figure_by:
@@ -76,13 +74,17 @@ implemented_observables:
       data_uncertainties:
       - uncertainties_legacy_PTY.yaml
     legacy:
-      theory:
+      theory: &id002
         conversion_factor: 1.0
         operation: 'NULL'
         FK_tables:
         - - ATLAS_1JET_8TEV_R06
-      data_uncertainties:
+      data_uncertainties: &id001
       - uncertainties_legacy_PTY.yaml
+    legacy_data:
+      data_uncertainties: *id001
+    legacy_theory:
+      theory: *id002
   theory:
     FK_tables:
     - - ATLAS_1JET_8TEV_R06_PTY_BIN1