renamed to mismatched, added report page

Author: jekoorn

validphys2/src/validphys/comparefittemplates/comparecard.yaml

@@ -99,9 +99,9 @@ lumi_report:
   meta: Null
   template: lumi.md
 
-excluded_datasets:
-  use_cuts: "fromfit"
-  from_: excluded
+mismatched_report:
+  meta: Null
+  template: mismatched.md
 
 template: report.md
 
@@ -123,8 +123,6 @@ dataspecs:
       from_: current
     speclabel:
       from_: current
-    dataset_inputs:
-      from_: fit
 
   - theoryid:
       from_: reference
@@ -134,8 +132,6 @@ dataspecs:
       from_: reference
     speclabel:
       from_: reference
-    dataset_inputs:
-      from_: fit
 
 t0_info:
   - use_t0: True

validphys2/src/validphys/comparefittemplates/mismatched.md

@@ -0,0 +1,5 @@
+% Data-theory comparison for the mismatched dataset {@dataset_name@}
+# Absolute
+{@plot_fancy@}
+# Normalized
+{@Datanorm plot_fancy@}

…parefittemplates/report_with_excluded.md …comparefittemplates/report_mismatched.mdvalidphys2/src/validphys/comparefittemplates/report_with_excluded.md renamed to validphys2/src/validphys/comparefittemplates/report_mismatched.md validphys2/src/validphys/comparefittemplates/report_with_excluded.md renamed to validphys2/src/validphys/comparefittemplates/report_mismatched.md

@@ -105,10 +105,10 @@ Dataset plots
 [Plots for {@dataset_name@}]({@dataset_report report@})
 {@endwith@}
 
-Datasets excluded from the fit
+Mismatched datasets
 --------------------------
-{@with matched_excluded_datasets_by_name@}
-Plots for {@dataset_name@}{@plot_fancy@}
+{@with mismatched_datasets_by_name@}
+[Plots for {@dataset_name@}]({@mismatched_report report@})
 {@endwith@}
 
 Positivity

validphys2/src/validphys/config.py

@@ -1016,8 +1016,7 @@ def produce_matched_datasets_from_dataspecs(self, dataspecs):
 #                 "dataset_name": i.name, 
 #                 **more_info} for i in dinputs_b[1:3]]
 
-    def produce_matched_excluded_datasets_by_name(self, dataspecs):
-        """Return excluded datasets, each tagged with the more_info from the dataspecs they came from."""
+    def produce_mismatched_datasets_by_name(self, dataspecs):
         """
         Like produce_matched_datasets_from_dataspecs, but for excluded datasets from a fit comparison.
         Return excluded datasets, each tagged with the more_info from the dataspecs they came from. Set up to work with plot_fancy.
@@ -1070,10 +1069,6 @@ def build_more_info(dataspec):
         return res
 
 
-
-    def produce_matched_excluded_datasets_from_dataspecs(self, dataspecs):
-        return self.produce_matched_excluded_datasets_by_name(dataspecs)
-
     def produce_matched_positivity_from_dataspecs(self, dataspecs):
         """Like produce_matched_datasets_from_dataspecs but for positivity datasets."""
         self._check_dataspecs_type(dataspecs)

validphys2/src/validphys/scripts/vp_comparefits.py

@@ -233,7 +233,7 @@ def complete_mapping(self):
         are_the_same = self.check_identical_theory_cuts_covmat()
         if are_the_same:
             log.info("Using excluded comparecard: identical theory cuts/covmat detected")
-            autosettings["template"] = "report_with_excluded.md"
+            autosettings["template"] = "report_mismatched.md"
             args['config_yml'] = comparefittemplates.template_with_excluded_path
         return autosettings