reindex systematic errors for inconsistent datasets in the same way a…

…s it is done for the central values
NNPDF · Oct 20, 2024 · 21cd934 · 21cd934
1 parent 58b4e75
commit 21cd934
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/validphys2/src/validphys/coredata.py b/validphys2/src/validphys/coredata.py
@@ -446,6 +446,7 @@ def export_uncertainties(self, buffer):
             k: v for k, v in sorted(definitions.items(), key=lambda item: item[1]["treatment"])
         }
         bins = []
+
         for idx, row in self.systematic_errors().iterrows():
             tmp = {"stat": float(self.stat_errors[idx])}
             # Hope things come in the right order...

diff --git a/validphys2/src/validphys/filters.py b/validphys2/src/validphys/filters.py
@@ -432,10 +432,12 @@ def _filter_inconsistent_closure_data(
 
         closure_data = make_level1_data(data, closure_data, filterseed, data_index, sep_mult)
 
+        # avoid circular import
         from validphys.closuretest.inconsistent_closuretest.inconsistent_ct import (
             InconsistentCommonData,
         )
 
+        # Convert the commondata to InconsistentCommonData
         closure_data = [
             InconsistentCommonData(
                 setname=cd.setname,
@@ -449,6 +451,7 @@ def _filter_inconsistent_closure_data(
             for cd in closure_data
         ]
 
+        # Process the commondata
         closure_data = [cd.process_commondata(**inconsistent_data_settings) for cd in closure_data]
 
         log.info("Writing Level1 data")
@@ -472,6 +475,26 @@ def _filter_inconsistent_closure_data(
 
         # And export it to file
         output_cd.export_data(data_path.open("w", encoding="utf-8"))
+
+        if cd.setname in inconsistent_data_settings["inconsistent_datasets"]:
+            # convert output_cd to InconsistentCommonData  (which has systematic_errors as a property and it's own export_uncertainties method)
+            # this is done for the inconsistent datasets only as the systematics of the other datasets are not modified
+
+            output_cd = InconsistentCommonData(
+                setname=output_cd.setname,
+                ndata=output_cd.ndata,
+                commondataproc=output_cd.commondataproc,
+                nkin=output_cd.nkin,
+                nsys=output_cd.nsys,
+                commondata_table=output_cd.commondata_table,
+                systype_table=output_cd.systype_table,
+            )
+
+            # put the inconsistent closure systematics into the raw systematics
+            new_sys = cd.systematic_errors.reindex(data_range, fill_value=0.0)
+            output_cd.systematic_errors = new_sys
+
+        # export it to file
         output_cd.export_uncertainties(unc_path.open("w", encoding="utf-8"))
 
     return total_data_points, total_cut_data_points