forcing namespace for experiment

NNPDF · Jul 9, 2020 · 471b4c5 · 471b4c5
1 parent bcd1870
commit 471b4c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py
@@ -1164,22 +1164,8 @@ def produce_group_dataset_inputs_by_metadata(
             for name, group in res.items()
         ]
 
-    def produce_group_dataset_inputs_by_experiment(
-        self, data_input):
-        res = defaultdict(list)
-        for dsinput in data_input:
-            cd = self.produce_commondata(dataset_input=dsinput)
-            try:
-                res[getattr(get_info(cd), "experiment")].append(dsinput)
-            except AttributeError:
-                raise ConfigError(
-                    f"Unable to find key: experiment in {cd.name} "
-                    "PLOTTING file."
-                )
-        return [
-            {"data_input": group, "experiment_name": name}
-            for name, group in res.items()
-        ]
+    def produce_force_group_by_experiment(self):
+        return {"metadata_group": 'experiment'}
 
 
     def produce_scale_variation_theories(self, theoryid, point_prescription):

diff --git a/validphys2/src/validphys/dataplots.py b/validphys2/src/validphys/dataplots.py
@@ -507,7 +507,7 @@ def plot_groups_data_chi2(groups_data, groups_chi2, processed_metadata_group):
     ax.set_title(r"$\chi^2$ distribution by {}".format(processed_metadata_group))
     return fig
 
-plot_experiments_chi2 = collect("plot_groups_data_chi2",  ("group_dataset_inputs_by_experiment",))
+plot_experiments_chi2 = collect("plot_groups_data_chi2",  ("force_group_by_experiment",))
 
 @figure
 def plot_datasets_chi2(groups_data, groups_chi2, each_dataset_chi2):

diff --git a/validphys2/src/validphys/results.py b/validphys2/src/validphys/results.py
@@ -217,7 +217,7 @@ def group_result_table(group_result_table_no_table):
     """Duplicate of group_result_table_no_table but with a table decorator."""
     return group_result_table_no_table
 
-experiment_result_table = collect('group_result_table', ("group_dataset_inputs_by_experiment",))
+experiment_result_table = collect('group_result_table', ("force_group_by_experiment",))
 
 @table
 def group_result_table_68cl(group_result_table_no_table: pd.DataFrame, pdf: PDF):
@@ -782,7 +782,7 @@ def groups_chi2_table(groups_data, pdf, groups_chi2,
             records.append(stats)
     return pd.DataFrame(records)
 
-experiments_chi2_table = collect('groups_chi2_table', ("group_dataset_inputs_by_experiment",))
+experiments_chi2_table = collect('groups_chi2_table', ("force_group_by_experiment",))
 
 @check_cuts_considered
 @table