From f26f9a23edfe2acb22af54b61a603601dafa3af5 Mon Sep 17 00:00:00 2001 From: Roy Stegeman Date: Thu, 6 Feb 2025 18:45:02 +0000 Subject: [PATCH] correctly load different types of theory covmats --- n3fit/src/n3fit/scripts/n3fit_exec.py | 3 +++ validphys2/src/validphys/config.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/n3fit/src/n3fit/scripts/n3fit_exec.py b/n3fit/src/n3fit/scripts/n3fit_exec.py index c7fb995cbf..73133ebf6f 100755 --- 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 index 771722b579..0e2ab7cc7a 100644 --- 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"