Using the same commondata for both radiuses

Author: achiefa

…commondata/ATLAS_1JET_7TEV_R04/data.yaml …commondata/ATLAS_1JET_7TEV/data_kt4.yamlnnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV_R04/data.yaml renamed to nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV/data_kt4.yaml nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV_R04/data.yaml renamed to nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV/data_kt4.yaml

@@ -13,15 +13,27 @@
 AVAILABLE_VARIANTS = ['nominal', 'weaker', 'stronger']
 
 
-def filter_ATLAS_1JET_7TEV_data_kinematics():
+def observable_selector(metadata: dict, observable: str):
+    """
+    Select the metadata for the given observable.
+    """
+    for obs in metadata["implemented_observables"]:
+        if obs["observable_name"] == observable:
+            return obs
+    raise ValueError(f"Observable {observable} not found in metadata.")
+
+
+def filter_ATLAS_1JET_7TEV_data_kinematics(observable: str = 'PTY-R06'):
     """
     Write kinematic values in the kinematics.yaml file.
     """
     with open("metadata.yaml") as file:
         metadata = yaml.safe_load(file)
 
     version = metadata["hepdata"]["version"]
-    tables = metadata["hepdata"]["tables"]
+    obs_metadata = observable_selector(metadata, observable)
+    tables = obs_metadata["tables"]
+    kinematics_filename = obs_metadata["kinematics"]["file"]
 
     kin = []
     for table in tables:
@@ -56,11 +68,11 @@ def filter_ATLAS_1JET_7TEV_data_kinematics():
 
     kinematics_yaml = {"bins": kin}
 
-    with open("kinematics.yaml", "w") as file:
+    with open(kinematics_filename, "w") as file:
         yaml.dump(kinematics_yaml, file, sort_keys=False)
 
 
-def filter_ALTAS_1JET_7TEV_data_uncertainties(variant='nominal'):
+def filter_ALTAS_1JET_7TEV_data_uncertainties(observable: str = 'PTY-R06', variant='nominal'):
     """
     Write uncertainties in the uncertainties.yaml file.
     """
@@ -74,7 +86,8 @@ def filter_ALTAS_1JET_7TEV_data_uncertainties(variant='nominal'):
         metadata = yaml.safe_load(file)
 
     version = metadata["hepdata"]["version"]
-    tables = metadata["hepdata"]["tables"]
+    obs_metadata = observable_selector(metadata, observable)
+    tables = obs_metadata["tables"]
 
     # get df of uncertainties
     dfs = []
@@ -133,23 +146,25 @@ def filter_ALTAS_1JET_7TEV_data_uncertainties(variant='nominal'):
 
     uncertainties_yaml = {"definitions": error_definition, "bins": error}
     if variant == 'nominal':
-        filename = 'uncertainties.yaml'
+        data_filename = obs_metadata['data_central']
+        uncertainties_filename = obs_metadata['data_uncertainties'][0]
     else:
-        filename = f"uncertainties_{variant}.yaml"
-    with open(filename, "w") as file:
+        data_filename = obs_metadata['variants'][variant]['data_central']
+        uncertainties_filename = obs_metadata['variants'][variant]['data_uncertainties'][0]
+
+    with open(uncertainties_filename, "w") as file:
         yaml.dump(uncertainties_yaml, file, sort_keys=False)
 
     data_central_yaml = {"data_central": cvs.tolist()}
-    if variant == 'nominal':
-        data_filename = 'data.yaml'
-    else:
-        data_filename = f"data_{variant}.yaml"
     with open(data_filename, "w") as file:
         yaml.dump(data_central_yaml, file, sort_keys=False)
 
 
 if __name__ == "__main__":
-    filter_ATLAS_1JET_7TEV_data_kinematics()
-    filter_ALTAS_1JET_7TEV_data_uncertainties('nominal')
-    filter_ALTAS_1JET_7TEV_data_uncertainties('weaker')
-    filter_ALTAS_1JET_7TEV_data_uncertainties('stronger')
+    filter_ATLAS_1JET_7TEV_data_kinematics(observable='PTY-R06')
+    filter_ALTAS_1JET_7TEV_data_uncertainties(observable='PTY-R06', variant='nominal')
+    filter_ALTAS_1JET_7TEV_data_uncertainties(observable='PTY-R06', variant='weaker')
+    filter_ALTAS_1JET_7TEV_data_uncertainties(observable='PTY-R06', variant='stronger')
+    filter_ALTAS_1JET_7TEV_data_uncertainties(observable='PTY-R04', variant='nominal')
+    filter_ALTAS_1JET_7TEV_data_uncertainties(observable='PTY-R04', variant='weaker')
+    filter_ALTAS_1JET_7TEV_data_uncertainties(observable='PTY-R04', variant='stronger')

…commondata/ATLAS_1JET_7TEV_R06/data.yaml …commondata/ATLAS_1JET_7TEV/data_kt6.yamlnnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV_R06/data.yaml renamed to nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV/data_kt6.yaml nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV_R06/data.yaml renamed to nnpdf_data/nnpdf_data/commondata/ATLAS_1JET_7TEV/data_kt6.yaml

@@ -0,0 +1,138 @@
+setname: ATLAS_1JET_7TEV
+version: 1
+version_comment: Dataset excluded in NNPDF4.0. First implementation in the new commondata format.
+arXiv:
+  url: https://arxiv.org/abs/1410.8857
+iNSPIRE:
+  url: https://inspirehep.net/literature/1325553
+hepdata:
+  url: https://www.hepdata.net/record/ins1325553
+  version: 1
+  tables: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+nnpdf_metadata:
+  nnpdf31_process: JETS
+  experiment: ATLAS
+
+implemented_observables:
+
+- observable_name: PTY-R06
+  observable:
+    description: Double-differential inclusive jet cross-section as functions of jet transverse momentum and the absolute jet rapidity R=0.6.
+    label: r"$10^{3*qbin} d^2\sigma/dp_Td|y|$"
+    units: '[pb/GeV]'
+  ndata: 140
+  tables:
+  - 7
+  - 8
+  - 9
+  - 10
+  - 11
+  - 12
+  process_type: JET
+  plotting:
+    dataset_label: ATLAS jets 7 TeV, R=0.6
+    x_scale: log
+    plot_x: pT
+    figure_by:
+    - y
+  kinematic_coverage:
+  - y
+  - pT
+  - sqrts
+  kinematics:
+    variables:
+      y:
+        description: jet rapidity
+        label: $|y|$
+        units: ''
+      pT:
+        description: jet transverse momentum
+        label: $k_{T}$
+        units: GeV
+      sqrts:
+        description: center of mass energy
+        label: r"$\sqrt(s)$"
+        units: GeV
+    file: kinematics.yaml
+  data_central: data_kt6.yaml
+  data_uncertainties:
+  - uncertainties_kt6.yaml
+  variants:
+    weaker:
+      data_uncertainties:
+        - uncertainties_weaker_kt6.yaml
+      data_central: data_weaker_kt6.yaml
+    stronger:
+      data_uncertainties:
+        - uncertainties_stronger_kt6.yaml
+      data_central: data_stronger_kt6.yaml
+  theory:
+    FK_tables:
+    - - ATLAS_1JET_7TEV_R06_BIN1
+      - ATLAS_1JET_7TEV_R06_BIN2
+      - ATLAS_1JET_7TEV_R06_BIN3
+      - ATLAS_1JET_7TEV_R06_BIN4
+      - ATLAS_1JET_7TEV_R06_BIN5
+      - ATLAS_1JET_7TEV_R06_BIN6
+    operation: 'null'
+
+- observable_name: PTY-R04
+  observable:
+    description: Double-differential inclusive jet cross-section as functions of jet transverse momentum and the absolute jet rapidity R=0.4.
+    label: r"$10^{3*qbin} d^2\sigma/dp_Td|y|$"
+    units: '[pb/GeV]'
+  ndata: 140
+  tables:
+  - 1
+  - 2
+  - 3
+  - 4
+  - 5
+  - 6
+  process_type: JET
+  plotting:
+    dataset_label: ATLAS jets 7 TeV, R=0.4
+    x_scale: log
+    plot_x: pT
+    figure_by:
+    - y
+  kinematic_coverage:
+  - y
+  - pT
+  - sqrts
+  kinematics:
+    variables:
+      y:
+        description: jet rapidity
+        label: $|y|$
+        units: ''
+      pT:
+        description: jet transverse momentum
+        label: $k_{T}$
+        units: GeV
+      sqrts:
+        description: center of mass energy
+        label: r"$\sqrt(s)$"
+        units: GeV
+    file: kinematics.yaml
+  data_central: data_kt4.yaml
+  data_uncertainties:
+  - uncertainties_kt4.yaml
+  variants:
+    weaker:
+      data_uncertainties:
+        - uncertainties_weaker_kt4.yaml
+      data_central: data_weaker_kt4.yaml
+    stronger:
+      data_uncertainties:
+        - uncertainties_stronger_kt4.yaml
+      data_central: data_stronger_kt4.yaml
+  theory:
+    FK_tables:
+    - - ATLAS_1JET_7TEV_R04_BIN1
+      - ATLAS_1JET_7TEV_R04_BIN2
+      - ATLAS_1JET_7TEV_R04_BIN3
+      - ATLAS_1JET_7TEV_R04_BIN4
+      - ATLAS_1JET_7TEV_R04_BIN5
+      - ATLAS_1JET_7TEV_R04_BIN6
+    operation: 'null'