Merge branch 'master' into ome_rust

NNPDF · Aug 9, 2024 · 837187b · 837187b
2 parents 6323f1b + bd70e21
commit 837187b
Show file tree

Hide file tree

Showing 95 changed files with 1,217 additions and 1,576 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -32,7 +32,7 @@ repos:
       - id: isort
         args: ["--profile", "black"]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
   - repo: https://github.com/pycqa/pydocstyle
@@ -43,6 +43,13 @@ repos:
         args: ["--add-ignore=D107,D105"]
         additional_dependencies:
           - toml
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.4.1
+    hooks:
+      - id: mypy
+        additional_dependencies: [types-PyYAML]
+        pass_filenames: false
+        args: ["--ignore-missing-imports", "src/"]
   - repo: local
     hooks:
     - id: fmt
@@ -53,6 +60,6 @@ repos:
       files: ^crates/.*\.rs$
       args: []
   - repo: https://github.com/pre-commit/pre-commit
-    rev: v3.7.1
+    rev: v3.8.0
     hooks:
       - id: validate_manifest
diff --git a/benchmarks/eko/benchmark_alphaem.py b/benchmarks/eko/benchmark_alphaem.py
@@ -35,9 +35,7 @@ def test_alphaQED_high(self):
             dict(
                 alphas=0.118,
                 alphaem=7.7553e-03,
-                scale=91.2,
-                num_flavs_ref=5,
-                max_num_flavs=5,
+                ref=(91.2, 5),
                 em_running=True,
             )
         )
@@ -75,9 +73,7 @@ def test_alphaQED_low(self):
             dict(
                 alphas=0.118,
                 alphaem=7.7553e-03,
-                scale=91.2,
-                num_flavs_ref=5,
-                max_num_flavs=5,
+                ref=(91.2, 5),
                 em_running=True,
             )
         )
@@ -124,9 +120,7 @@ def test_validphys(self):
             dict(
                 alphas=0.118,
                 alphaem=7.7553e-03,
-                scale=91.2,
-                num_flavs_ref=5,
-                max_num_flavs=5,
+                ref=(91.2, 5),
                 em_running=True,
             )
         )

diff --git a/benchmarks/eko/benchmark_evol_to_unity.py b/benchmarks/eko/benchmark_evol_to_unity.py
@@ -19,16 +19,12 @@ def update_cards(theory: TheoryCard, operator: OperatorCard):
     theory.couplings = CouplingsInfo(
         alphas=0.35,
         alphaem=0.007496,
-        scale=float(np.sqrt(2)),
-        max_num_flavs=6,
-        num_flavs_ref=None,
+        ref=(float(np.sqrt(2)), 4),
     )
-    theory.heavy.num_flavs_init = 4
-    theory.heavy.intrinsic_flavors = [4, 5]
     theory.heavy.masses.c.value = 1.0
     theory.heavy.masses.b.value = 4.75
     theory.heavy.masses.t.value = 173.0
-    operator.mu0 = float(np.sqrt(2))
+    operator.init = (float(np.sqrt(2)), 4)
     operator.mugrid = [(10, 5)]
     operator.xgrid = XGrid(np.linspace(1e-1, 1, 30))
     operator.configs.interpolation_polynomial_degree = 1

diff --git a/benchmarks/eko/benchmark_inverse_matching.py b/benchmarks/eko/benchmark_inverse_matching.py
@@ -20,14 +20,9 @@
     couplings=dict(
         alphas=0.118,
         alphaem=0.007496252,
-        scale=91.2,
-        num_flavs_ref=5,
-        max_num_flavs=6,
+        ref=(91.2, 5),
     ),
     heavy=dict(
-        num_flavs_init=4,
-        num_flavs_max_pdf=6,
-        intrinsic_flavors=[],
         masses=[ReferenceRunning([mq, np.nan]) for mq in (MC, 4.92, 172.5)],
         masses_scheme="POLE",
         matching_ratios=[1.0, 1.0, np.inf],
@@ -40,7 +35,7 @@
 
 # operator settings
 op_raw = dict(
-    mu0=1.65,
+    init=(1.65, 4),
     xgrid=[0.0001, 0.001, 0.01, 0.1, 1],
     mugrid=[(MC, 3), (MC, 4)],
     configs=dict(

diff --git a/benchmarks/eko/benchmark_msbar_evolution.py b/benchmarks/eko/benchmark_msbar_evolution.py
@@ -21,9 +21,8 @@
 
 def update_theory(theory: TheoryCard):
     theory.order = (3, 0)
-    theory.couplings.scale = 91
+    theory.couplings.ref = (91, 5)
     theory.couplings.alphaem = 0.007496
-    theory.couplings.num_flavs_ref = 5
     theory.heavy.masses_scheme = QuarkMassScheme.MSBAR
     theory.heavy.masses.c = QuarkMassRef([1.5, 18])
     theory.heavy.masses.b = QuarkMassRef([4.1, 20])
@@ -150,7 +149,7 @@ def benchmark_APFEL_msbar_evolution(
                     apfel.SetTheory("QCD")
                     apfel.SetPerturbativeOrder(order - 1)
                     apfel.SetAlphaEvolution(method)
-                    apfel.SetAlphaQCDRef(coupl.alphas, coupl.scale)
+                    apfel.SetAlphaQCDRef(coupl.alphas, coupl.ref[0])
                     apfel.SetVFNS()
                     apfel.SetMSbarMasses(
                         qmasses.c.value, qmasses.b.value, qmasses.t.value
@@ -218,7 +217,7 @@ def benchmark_APFEL_msbar_solution(
                 apfel.SetTheory("QCD")
                 apfel.SetPerturbativeOrder(order - 1)
                 apfel.SetAlphaEvolution("exact")
-                apfel.SetAlphaQCDRef(coupl.alphas, coupl.scale)
+                apfel.SetAlphaQCDRef(coupl.alphas, coupl.ref[0])
                 apfel.SetVFNS()
                 apfel.SetMSbarMasses(qmasses.c.value, qmasses.b.value, qmasses.t.value)
                 apfel.SetMassScaleReference(