Merge branch 'numerical_fonll' into massive_n3lo

NNPDF · Oct 7, 2023 · 1566045 · 1566045
2 parents ef006c1 + 62022b1
commit 1566045
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 50 deletions.
diff --git a/benchmarks/runners/sandbox.py b/benchmarks/runners/sandbox.py
@@ -151,7 +151,6 @@ def run_pineappl(self):
         #  t["FNS"] = "FFNS"
         t["NfFF"] = 4
         t["PTO"] = 1
-        #  t["kDISbThr"] = 10
         #  t["mb"] = 1e6
         #  t["mt"] = 1e7
         self.run([t], [o], [

diff --git a/extras/fonll_hq_treatment/utils.py b/extras/fonll_hq_treatment/utils.py
@@ -48,9 +48,6 @@
     "Comments": "NNPDF4.0 NNLO alphas=0.118",
     "global_nx": 0,
     "EScaleVar": 1,
-    "kDIScThr": 1.0,
-    "kDISbThr": 1.0,
-    "kDIStThr": 1.0,
 }
 
 observables_card = {

diff --git a/src/yadbox/runcards/theory.py b/src/yadbox/runcards/theory.py
@@ -3,6 +3,6 @@ def ffns(nf):
 
     for i, q in enumerate("cbt"):
         theory[f"ZM{q}"] = True
-        theory[f"kDIS{q}Thr"] = 0.0 if nf >= i + 4 else float("inf")
+        theory[f"k{q}Thr"] = 0.0 if nf >= i + 4 else float("inf")
 
     return theory
diff --git a/src/yadism/input/compatibility.py b/src/yadism/input/compatibility.py
@@ -98,7 +98,7 @@ def update_target(obs):
 
 def update_fns(theory):
     """
-    Shifts kcThr around and add the kDIScThr parameter (likewise for all heavy quarks).
+    Sets k{fl}Thr and  ZM{fl} for all heavy flavours depending on the scheme.
 
     Parameters
     ----------
@@ -140,9 +140,8 @@ def update_fns(theory):
     else:
         raise ValueError(f"Scheme '{fns}' not recognized.")
 
-    # here there is no difference between DGLAP and DIS
-    for fl in hqfl:
-        theory[f"kDIS{fl}Thr"] = theory[f"k{fl}Thr"]
-
     if "PTODIS" not in theory:
         theory["PTODIS"] = theory["PTO"]
+
+    if "FONLLParts" not in theory:
+        theory["FONLLParts"] = "full"
diff --git a/src/yadism/input/domains.yaml b/src/yadism/input/domains.yaml
@@ -166,36 +166,6 @@
   domain:
     - 3 <= nf <= 6
 
-- name: CharmThresholdRatio
-  known_as: kDIScThr
-  runcard: theory
-  description: >
-    Ratio between the charm threshold for VFNS and the specified value for
-    charm mass `mc`
-  type: real
-  domain:
-    - kDIScThr > 0
-
-- name: BottomThresholdRatio
-  known_as: kDISbThr
-  runcard: theory
-  description: >
-    Ratio between the bottom threshold for VFNS and the specified value for
-    bottom mass `mb`
-  type: real
-  domain:
-    - kDISbThr > 0
-
-- name: TopThresholdRatio
-  known_as: kDIStThr
-  runcard: theory
-  description: >
-    Ratio between the top threshold for VFNS and the specified value for top
-    mass `mt`
-  type: real
-  domain:
-    - kDIStThr > 0
-
 # Masses
 # ~~~~~~
 - name: MassScheme

diff --git a/src/yadism/input/inspector.py b/src/yadism/input/inspector.py
@@ -66,7 +66,7 @@ def check_domains(self):
 
             # check value provided by user
             try:
-                # retroeve the checker from available checkers and value from
+                # retrieve the checker from available checkers and value from
                 # user input, apply the first on the latter
                 name = dom_def["known_as"] if "known_as" in dom_def else dom_def["name"]
                 checker.check_value(

diff --git a/src/yadism/runner.py b/src/yadism/runner.py
@@ -118,7 +118,7 @@ def __init__(self, theory: dict, observables: dict):
         # Initialize structure functions
         masses = np.power([new_theory["mc"], new_theory["mb"], new_theory["mt"]], 2)
         thresholds_ratios = np.power(
-            [new_theory["kDIScThr"], new_theory["kDISbThr"], new_theory["kDIStThr"]], 2
+            [new_theory["kcThr"], new_theory["kbThr"], new_theory["ktThr"]], 2
         )
         managers = dict(
             interpolator=interpolator,
@@ -146,7 +146,7 @@ def __init__(self, theory: dict, observables: dict):
             GF=theory["GF"],
             M2W=theory["MW"] ** 2,
             M2target=theory["MP"] ** 2,
-            fonllparts=theory["FONLLParts"],
+            fonllparts=new_theory["FONLLParts"],
             n3lo_cf_variation=theory["n3lo_cf_variation"]
         )
         logger.info(

diff --git a/tests/yadism/input/test_inspector.py b/tests/yadism/input/test_inspector.py
@@ -35,9 +35,6 @@ def test_domain(self):
             "kcThr": 1.0,
             "kbThr": 1.0,
             "ktThr": 1.0,
-            "kDIScThr": 1.0,
-            "kDISbThr": 1.0,
-            "kDIStThr": 1.0,
             "MZ": 91.1876,
             "MW": 90.398,
             "GF": 1.1663787e-05,

diff --git a/tests/yadism/test_init.py b/tests/yadism/test_init.py
@@ -35,9 +35,6 @@
     "kcThr": 1.0,
     "kbThr": 1.0,
     "ktThr": 1.0,
-    "kDIScThr": 1.0,
-    "kDISbThr": 1.0,
-    "kDIStThr": 1.0,
     "MaxNfPdf": 6,
     "MaxNfAs": 6,
     "MZ": 91.1876,

diff --git a/tests/yadism/test_runner.py b/tests/yadism/test_runner.py
@@ -70,7 +70,7 @@ def fake_update(*args):
 
         pto = data.draw(st.integers(0, 3))
         masses = {f"m{q}": v + 2.0 for v, q in enumerate("cbt")}
-        kthr = {f"kDIS{q}Thr": v + 2.0 for v, q in enumerate("cbt")}
+        kthr = {f"k{q}Thr": v + 2.0 for v, q in enumerate("cbt")}
         zm_masses = {f"ZM{q}": True for q in "cbt"}
         theory = dict(
             PTO=pto,