Merge pull request #2115 from NNPDF/rs_quickfix

take n3lo_ad_variations from the corresponding key in theorycard instead of 'Comments'

validphys2/src/validphys/theorycovariance/theorycovarianceutils.py

@@ -3,6 +3,7 @@
 
 Low level utilities for theorycovariance module
 """
+
 import logging
 
 from reportengine.checks import check, make_argcheck
@@ -58,21 +59,25 @@ def check_correct_theory_combination_internal(
         correct_xirs = [1.0, 1.0, 1.0, 2.0, 0.5, 2.0, 0.5]
     elif l in [62, 64, 66, 70]:
         # check Anomalous dimensions variations
-        n3lo_vars_dict = {"gg": 19, "gq": 21, "qg": 15, "qq": 6}
-        # TODO: for the moment fish the n3lo_ad_variation from the comments
-        n3lo_vars_list = []
         id_max = None
         if l == 70:
             id_max = -8
         elif l == 66:
             id_max = -4
         elif l == 64:
             id_max = -2
+        n3lo_vars_list = []
         for theoryid in theoryids[:id_max]:
-            n3lo_vars_list.append(
-                [int(val) for val in theoryid.get_description()["Comments"][28:-1].split(",")]
-            )
+            n3lo_ad_variation = theoryid.get_description()["n3lo_ad_variation"]
+            # Only take the first 4, the last three are NS and only relevant for FHMRUVV
+            if any(n3lo_ad_variation[4:]):
+                raise ValueError(
+                    f"Theory {theoryid.id} has non-zero entries in the last three (NS) elements "
+                    "of n3lo_ad_variation, the covmat construction does not support this!"
+                )
+            n3lo_vars_list.append(theoryid.get_description()["n3lo_ad_variation"][:4])
         full_var_list = [[0, 0, 0, 0]]
+        n3lo_vars_dict = {"gg": 19, "gq": 21, "qg": 15, "qq": 6}
         for entry, max_var in enumerate(n3lo_vars_dict.values()):
             for idx in range(1, max_var + 1):
                 base_var = [0, 0, 0, 0]