From 2b6b2321c79f7b266a43378402de8516e371c184 Mon Sep 17 00:00:00 2001 From: RoyStegeman Date: Tue, 6 Dec 2022 17:07:11 +0000 Subject: [PATCH] cosmetic changes --- .../scalevariations/scalevariationtheoryids.yaml | 2 +- validphys2/src/validphys/theorycovariance/construction.py | 8 ++++---- .../validphys/theorycovariance/theorycovarianceutils.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml index 62dcbb9686..484e3f5286 100644 --- a/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml +++ b/validphys2/src/validphys/scalevariations/scalevariationtheoryids.yaml @@ -59,7 +59,7 @@ scale_variations_for: (2, 0.5): 436 (2, 1): 437 (2, 2): 438 - + - theoryid: 200 variations: # alpha_s 3pt variations diff --git a/validphys2/src/validphys/theorycovariance/construction.py b/validphys2/src/validphys/theorycovariance/construction.py index f1947ad194..6df07e94f8 100644 --- a/validphys2/src/validphys/theorycovariance/construction.py +++ b/validphys2/src/validphys/theorycovariance/construction.py @@ -370,10 +370,10 @@ def covs_pt_prescrip( deltas1 = list((other - central1 for other in others1)) central2, *others2 = process_info.theory[name2] deltas2 = list((other - central2 for other in others2)) - if point_prescription in ["alpha_s", "alpha_s_reduced", "alpha_s_extended", "alpha_s_0119", "alpha_s_extended_0119"]: - s = covmat_alphas(name1, name2, deltas1, deltas2) - elif l == 3: - if point_prescription == "3f point": + if l == 3: + if point_prescription.startswith("alpha_s"): + s = covmat_alphas(name1, name2, deltas1, deltas2) + elif point_prescription == "3f point": s = covmat_3fpt(name1, name2, deltas1, deltas2) elif point_prescription == "3r point": s = covmat_3rpt(name1, name2, deltas1, deltas2) diff --git a/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py b/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py index 0d2c9cb624..6b4a3bc7b2 100644 --- a/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py +++ b/validphys2/src/validphys/theorycovariance/theorycovarianceutils.py @@ -23,7 +23,7 @@ def check_correct_theory_combination_internal( xifs = [theoryid.get_description()["XIF"] for theoryid in theoryids] xirs = [theoryid.get_description()["XIR"] for theoryid in theoryids] if l == 3: - if point_prescription in ["alpha_s", "alpha_s_reduced", "alpha_s_extended", "alpha_s_0119", "alpha_s_extended_0119"]: + if point_prescription.startswith("alpha_s"): correct_xifs = [1.0, 1.0, 1.0] correct_xirs = [1.0, 1.0, 1.0] elif point_prescription == "3f point":