add n3lo variations grids and other fixes

NNPDF · Sep 21, 2023 · 96daca5 · 96daca5
1 parent 264372b
commit 96daca5
Show file tree

Hide file tree

Showing 28 changed files with 423 additions and 361 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -44,7 +44,7 @@ eko = "^0.13.4"
 pandas = "^1.3.0"
 rich = "^12.4.4"
 LeProHQ = "^0.2.3"
-adani = "^0.12"
+adani = "^0.13"
 # pineappl dependency
 pineappl = { version = "^0.6.0", optional = true }
 # yadmark

diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf3_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf3_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf3_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf3_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf3_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf3_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf4_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf4_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf4_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf4_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf4_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2g_nf4_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf3_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf3_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf3_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf3_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf3_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf3_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf4_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf4_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf4_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf4_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf4_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/C2q_nf4_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf3_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf3_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf3_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf3_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf3_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf3_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf4_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf4_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf4_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf4_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf4_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLg_nf4_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf3_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf3_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf3_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf3_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf3_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf3_var1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf4_var-1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf4_var-1.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf4_var0.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf4_var0.npy
diff --git a/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf4_var1.npy b/src/yadism/coefficient_functions/heavy/n3lo/grids/CLq_nf4_var1.npy
diff --git a/src/yadism/esf/result.py b/src/yadism/esf/result.py
@@ -86,8 +86,8 @@ def apply_pdf(self, lhapdf_like, pids, xgrid, alpha_s, alpha_qed, xiR, xiF):
             lnF = 1.0 if o[3] == 0 else (np.log((1 / xiF) ** 2)) ** o[3]
             lnR = 1.0 if o[2] == 0 else (np.log((1 / xiR) ** 2)) ** o[2]
             prefactor = (a_s ** o[0]) * (alph_qed ** o[1]) * lnR * lnF
-            res += prefactor * np.einsum("aj,aj", v, pdfs)
-            err += prefactor * np.einsum("aj,aj", e, pdfs)
+            res += prefactor * np.einsum("aj,aj", v, pdfs, optimize="optimal")
+            err += prefactor * np.einsum("aj,aj", e, pdfs, optimize="optimal")
 
         return dict(x=self.x, Q2=self.Q2, result=res, error=err)
 

diff --git a/src/yadism/runner.py b/src/yadism/runner.py
@@ -147,7 +147,7 @@ def __init__(self, theory: dict, observables: dict):
             M2W=theory["MW"] ** 2,
             M2target=theory["MP"] ** 2,
             fonllparts=theory["FONLLParts"],
-            n3lo_cf_variation=theory.get("n3lo_cf_variation",0)
+            n3lo_cf_variation=theory["n3lo_cf_variation"]
         )
         logger.info(
             "PTO: %d, PTO@evolution: %d, process: %s",