Merge pull request #2274 from NNPDF/fix_usercovmats

correctly load different types of theory covmats
NNPDF · Feb 7, 2025 · c8f9ee5 · c8f9ee5
2 parents 8896921 + f26f9a2
commit c8f9ee5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/n3fit/src/n3fit/scripts/n3fit_exec.py b/n3fit/src/n3fit/scripts/n3fit_exec.py
@@ -159,6 +159,9 @@ def from_yaml(cls, o, *args, **kwargs):
             N3FIT_FIXED_CONFIG['use_thcovmat_in_sampling'] = thconfig.get(
                 'use_thcovmat_in_sampling', True
             )
+            N3FIT_FIXED_CONFIG['point_prescriptions'] = thconfig.get('point_prescriptions')
+            N3FIT_FIXED_CONFIG['user_covmat_path'] = thconfig.get('user_covmat_path')
+
         file_content.update(N3FIT_FIXED_CONFIG)
         return cls(file_content, *args, **kwargs)
 

diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py
@@ -797,7 +797,7 @@ def produce_loaded_theory_covmat(
         # Load correct file according to how the thcovmat was generated by vp-setupfit
         generic_path = "datacuts_theory_theorycovmatconfig_theory_covmat_custom.csv"
         if user_covmat_path is not None:
-            if point_prescriptions is not None:
+            if point_prescriptions is not None and point_prescriptions != []:
                 generic_path = "datacuts_theory_theorycovmatconfig_total_theory_covmat.csv"
             else:
                 generic_path = "datacuts_theory_theorycovmatconfig_user_covmat.csv"