update construction.py and theorycovarianceutils.py to reflect change…

…s in pointprescriptions

validphys2/src/validphys/theorycovariance/construction.py

@@ -254,31 +254,26 @@ def compute_covs_pt_prescrip(point_prescription, name1, deltas1, name2=None, del
         s = covmat_5pt(name1, name2, deltas1, deltas2)
     elif point_prescription == "5bar point":
         s = covmat_5barpt(name1, name2, deltas1, deltas2)
-    # 7pt (Gavin)
     elif point_prescription == "7 point":
+        # 7pt (Gavin)
         s = covmat_7pt(name1, name2, deltas1, deltas2)
     elif point_prescription == "9 point":
         s = covmat_9pt(name1, name2, deltas1, deltas2)
-    # n3lo ad variation prescriprion
-    elif point_prescription == "n3lo ad ihou":
+    elif point_prescription == "ad ihou":
+        # n3lo ad variation prescriprion
         s = covmat_n3lo_singlet(name1, name2, deltas1, deltas2)
-    # n3lo ihou prescriprion
-    elif point_prescription == "n3lo dis ihou":
+    elif point_prescription == "dis ihou":
+        # n3lo ihou prescriprion
         s = covmat_3pt(name1, name2, deltas1, deltas2)
-    # N3LO 3 point scale variations for datasets with no N3LO corrections
-    elif point_prescription == "n3lo 3pt missing":
+    elif point_prescription == "3pt missing":
+        # 3 point renormalization scale variations for subset of data
         s = covmat_3pt(name1, name2, deltas1, deltas2)
-    # N3LO 3 point scale variations for hadronic datasets
-    elif point_prescription == "n3lo 3pt hadronic":
+    elif point_prescription == "3pt hadronic":
+        # N3LO 3 point scale variations for hadronic datasets
         s = covmat_3pt(name1, name2, deltas1, deltas2)
-    elif point_prescription == "n3lo 7 point":
-        s = covmat_7pt(name1, name2, deltas1, deltas2)
-    # n3lo full covmat prescriprion
-    elif point_prescription == "n3lo fhmv":
+    elif point_prescription == "fhmv ihou":
+        # n3lo full covmat prescriprion
         s = covmat_n3lo_fhmv(name1, name2, deltas1, deltas2)
-    # Polarized missing: 3 point renormalization scales for JETS and DIJETS
-    elif point_prescription == "3pt missing":
-        s = covmat_3pt(name1, name2, deltas1, deltas2)
     return s
 
 

validphys2/src/validphys/theorycovariance/theorycovarianceutils.py

@@ -30,7 +30,7 @@ def check_correct_theory_combination_internal(
     if point_prescription == "3 point":
         correct_xifs = [1.0, 2.0, 0.5]
         correct_xirs = [1.0, 2.0, 0.5]
-    if point_prescription in ["3pt missing", "n3lo 3pt missing", "n3lo 3pt hadronic"]:
+    if point_prescription in ["3pt missing", "3pt hadronic"]:
         correct_xifs = [1.0, 1.0, 1.0]
         correct_xirs = [1.0, 0.5, 2.0]
     if point_prescription == "5 point":
@@ -39,18 +39,18 @@ def check_correct_theory_combination_internal(
     if point_prescription == "5bar point":
         correct_xifs = [1.0, 2.0, 0.5, 2.0, 0.5]
         correct_xirs = [1.0, 2.0, 0.5, 0.5, 2.0]
-    if point_prescription in ["7 point", "n3lo 7 point"]:
+    if point_prescription in ["7 point"]:
         correct_xifs = [1.0, 2.0, 0.5, 1.0, 1.0, 2.0, 0.5]
         correct_xirs = [1.0, 1.0, 1.0, 2.0, 0.5, 2.0, 0.5]
     if correct_xirs != None and correct_xifs != None:
         # some covmats don't rely on scale variations so we don't explicitly check those
         check(
             xifs == correct_xifs and xirs == correct_xirs,
             "Choice of input theories does not correspond to a valid "
-            "prescription for theory covariance matrix calculation",
+            "prescription for the requested scale variation covmat",
         )
 
-    if point_prescription == "n3lo ad ihou":
+    if point_prescription == "ad ihou":
         n3lo_vars_list = []
         for theoryid in theoryids:
             n3lo_vars_list.append(theoryid.get_description()["n3lo_ad_variation"][:4])
@@ -66,6 +66,7 @@ def check_correct_theory_combination_internal(
             f"Theories do not include the full list of N3LO variation but {n3lo_vars_list}",
         )
 
+
 check_correct_theory_combination = make_argcheck(check_correct_theory_combination_internal)