removed comments, included check_fit..as_input() in vp_comparefits

Author: jekoorn

validphys2/src/validphys/fitdata.py

@@ -282,35 +282,6 @@ def t0_chi2_info_table(pdf, dataset_inputs_abs_chi2_data, t0pdfset, use_t0):
 all_datasets = collect('dataset', ('data',))
 fits_datasets = collect('all_datasets', ('fits', 'fitinputcontext'))
 
-#def match_excluded_datasets_by_name(match_datasets_by_name):
-#    """Like produce_matched_datasets_from_dataspecs but for all datasets excluded from the fit."""
-#    self._check_dataspecs_type(dataspecs)
-#    loader = Loader()
-#
-#    implemented = set(loader.implemented_datasets)
-#    all_used = []
-#
-#    for spec in dataspecs:
-#        with self.set_context(ns=self._curr_ns.new_child(spec)):
-#            _, data_input = self.parse_from_(None, "data_input", write=False)
-#            names = {}
-#            for dsin in data_input:
-#                cd = self.produce_commondata(dataset_input=dsin)
-#                proc = get_info(cd).nnpdf31_process
-#                ds = dsin.name
-#                names[(proc, ds)] = dsin
-#            all_used.append(names)
-#
-#    used_union = {ds for d in all_used for (_, ds) in d.keys()}
-#    excluded_set = implemented - used_union
-
-#    datasetcomp = match_datasets_by_name()
-
-
-#    return excluded_set
-
-
-
 
 @make_argcheck
 def _assert_two_fits(fits):

validphys2/src/validphys/scripts/vp_comparefits.py

@@ -241,15 +241,14 @@ def get_config(self):
         return self.config_class(c, environment=self.environment)
 
     def check_identical_theory_cuts_covmat(self):
+        """ 
+        Checks whether the theory ID, data cuts, and thcovmat are the same between the two fits.    
+        In the affirmative case, a mismatched datasets page will be added to the report.
+        """
         args = self.args
         l = self.environment.loader 
-        current_runcard_path = l.check_fit(args['current_fit']).path / "filter.yml"
-        reference_runcard_path = l.check_fit(args['reference_fit']).path / "filter.yml"  
-       
-        with open(current_runcard_path) as fc:
-            with open(reference_runcard_path) as fr:
-                current_runcard = yaml_safe.load(fc)
-                reference_runcard = yaml_safe.load(fr)
+        current_runcard = l.check_fit(args['current_fit']).as_input()
+        reference_runcard = l.check_fit(args['reference_fit']).as_input()
 
         current_thcovmat = current_runcard.get("theorycovmatconfig")
         reference_thcovmat = reference_runcard.get("theorycovmatconfig")