Merge branch 'release/0.8.5'

* release/0.8.5: Update banana to v0.6 Update Readme Update CONTRIBUTING Run pre-commit fix path in apfel bench Fix register and cfg in ekomark Recover test coverage to 100% Add CT18ZNNLO bench, update pre-commit Revert Init QED Update pre-commit hook, add few others Add FORM inversion snippet Run poe format Improve MSbar handling Move msbar, choose banner Switch eko tests badge
NNPDF · Feb 14, 2022 · e98971a · e98971a
2 parents d02dbe8 + 14da857
commit e98971a
Show file tree

Hide file tree

Showing 59 changed files with 720 additions and 713 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 :tada: Thanks, for considering to contribute to EKO!
 
 :pray: For the sake of simplicity we switch below to imperative
-language, however, please read a "Please" infront of everything.
+language, however, please read a "Please" in front of everything.
 
 -   :brain: Be reasonable and use common sense when contributing: we
     added some points we would like to highlight below
@@ -14,19 +14,18 @@ language, however, please read a "Please" infront of everything.
 
 ## Tools
 
--   [`poetry`](https://github.com/python-poetry/poetry) is the
+-   :books: [`poetry`](https://github.com/python-poetry/poetry) is the
     dependency manager and packaging back-end of choice for this
-    project, refers to official [installation
+    project - see the official [installation
     guide](https://python-poetry.org/docs/#installation)
--   [`poery-dynamic-versioning`](https://github.com/mtkennerly/poetry-dynamic-versioning),
+-   :hash: [`poery-dynamic-versioning`](https://github.com/mtkennerly/poetry-dynamic-versioning),
     is used to update the package version based on VCS status (tags and
     commits); note that since the version is dumped in output object,
     this is to be used not only for releases, but whenever output is
     generated (and intended to be used)
--   [`pre-commit`](https://pre-commit.com/) is used to enforce
+-   :parking: [`pre-commit`](https://pre-commit.com/) is used to enforce
     automation and standardize the tools for all developers; if you want
-    to contribute to this project, please
-    [install](https://pre-commit.com/#install) it and \[setup\]
+    to contribute to this project, install it and setup
 
 ## Testing
 

diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -1,4 +1,4 @@
-name: unit tests
+name: tests
 
 on:
   push:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,17 +2,29 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
+      - id: check-toml
+      - id: check-merge-conflict
+      - id: debug-statements
+      - id: fix-encoding-pragma
   - repo: https://github.com/psf/black
-    rev: 21.6b0
+    rev: 22.1.0
     hooks:
       - id: black
+  - repo: https://github.com/asottile/blacken-docs
+    rev: v1.12.1
+    hooks:
+      - id: blacken-docs
   - repo: https://github.com/pycqa/isort
-    rev: 5.9.1
+    rev: 5.10.1
     hooks:
       - id: isort
         args: ["--profile", "black"]
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.0
+    hooks:
+      - id: pyupgrade
diff --git a/README.md b/README.md
@@ -2,13 +2,13 @@
   <a href="https://n3pdf.github.io/eko/"><img alt="EKO" src="https://raw.githubusercontent.com/N3PDF/eko/master/doc/source/img/Logo.png" width=300></a>
 </p>
 <p align="center">
-  <a href="https://github.com/N3PDF/eko/actions?query=workflow%3A%22eko%22"><img alt="Tests" src="https://github.com/N3PDF/eko/workflows/eko/badge.svg" /></a>
+  <a href="https://github.com/N3PDF/eko/actions/workflows/unittests.yml"><img alt="Tests" src="https://github.com/N3PDF/eko/actions/workflows/unittests.yml/badge.svg" /></a>
   <a href="https://eko.readthedocs.io/en/latest/?badge=latest"><img alt="Docs" src="https://readthedocs.org/projects/eko/badge/?version=latest"></a>
   <a href="https://codecov.io/gh/N3PDF/eko"><img src="https://codecov.io/gh/N3PDF/eko/branch/master/graph/badge.svg" /></a>
   <a href="https://www.codefactor.io/repository/github/n3pdf/eko"><img src="https://www.codefactor.io/repository/github/n3pdf/eko/badge" alt="CodeFactor" /></a>
 </p>
 
-EKO is a Python module to solve the DGLAP equations in terms of Evolution Kernel Operators in x-space.
+EKO is a Python module to solve the DGLAP equations in N-space in terms of Evolution Kernel Operators in x-space.
 
 ## Installation
 EKO is available via PyPI: <a href="https://pypi.org/project/eko/"><img alt="PyPI" src="https://img.shields.io/pypi/v/eko"/></a> - so you can simply run
@@ -26,21 +26,21 @@ poetry install
 ```
 
 To setup `poetry`, and other tools, see [Contribution
-Guidlines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md).
+Guidelines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md).
 
 ## Documentation
 - The documentation is available here: <a href="https://eko.readthedocs.io/en/latest/?badge=latest"><img alt="Docs" src="https://readthedocs.org/projects/eko/badge/?version=latest"></a>
 - To build the documentation from source install [graphviz](https://www.graphviz.org/) and run in addition to the installation commands
 ```bash
-pip install -r dev_requirements.txt
-cd doc
-make html
+poe docs
 ```
 
 ## Citation policy
-Please cite our DOI when using our code: <a href="https://doi.org/10.5281/zenodo.3874237"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.3874237.svg" alt="DOI"/></a>
+When using our code please cite
+- our DOI: <a href="https://doi.org/10.5281/zenodo.3874237"><img src="https://zenodo.org/badge/DOI/10.5281/zenodo.3874237.svg" alt="DOI"/></a>
+- our paper: [![arXiv](https://img.shields.io/badge/arXiv-2202.02338-b31b1b?labelColor=222222)](https://arxiv.org/abs/2202.02338)
 
 ## Contributing
 - Your feedback is welcome! If you want to report a (possible) bug or want to ask for a new feature, please raise an issue: <a href="https://img.shields.io/github/issues/N3PDF/eko"><img alt="GitHub issues" src="https://img.shields.io/github/issues/N3PDF/eko"/></a>
 - Please follow our [Code of Conduct](https://github.com/N3PDF/eko/blob/master/.github/CODE_OF_CONDUCT.md) and read the
-  [Contribution Guidlines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md)
+  [Contribution Guidelines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md)
diff --git a/benchmarks/CT14_bench.py b/benchmarks/CT14_bench.py
@@ -1,4 +1,4 @@
-## -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """
 Benchmark CT14 pdf family
 

diff --git a/benchmarks/CT18_bench.py b/benchmarks/CT18_bench.py
@@ -1,4 +1,4 @@
-## -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """
 Benchmark CT18 pdf family
 
@@ -51,6 +51,29 @@ def benchmark_nnlo(self, Q0=1.295, Q2grid=(1e4,)):
         ]
         self.run([theory_card], [operator_card], ["CT18NNLO"])
 
+    def benchmark_znnlo(self, Q0=1.3, Q2grid=(1e4,)):
+        theory_card = base_theory.copy()
+        theory_card.update(
+            {
+                "alphas": 0.118000,
+                "PTO": 2,
+                "Q0": Q0,
+                "MaxNfPdf": 5,
+                "MaxNfAs": 5,
+                "mc": 1.4,
+            }
+        )
+        operator_card = {"Q2grid": list(Q2grid)}
+        self.skip_pdfs = lambda _theory: [
+            -6,
+            6,
+            22,
+            "ph",
+            "T35",
+            "V35",
+        ]
+        self.run([theory_card], [operator_card], ["CT18ZNNLO"])
+
 
 if __name__ == "__main__":
     b = BenchmarkCT18()

diff --git a/benchmarks/HERA20_bench.py b/benchmarks/HERA20_bench.py
@@ -1,4 +1,4 @@
-## -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """
 Benchmark HERAPDF2.0 pdf family
 

diff --git a/benchmarks/NNPDF_bench.py b/benchmarks/NNPDF_bench.py
@@ -1,4 +1,4 @@
-## -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 """
 Benchmark NNDPF31 pdf family
 """

diff --git a/benchmarks/apfel_bench.py b/benchmarks/apfel_bench.py
@@ -3,10 +3,11 @@
     Benchmark EKO to Apfel
 """
 import numpy as np
+from banana import register
 from banana.data import cartesian_product
+
 from ekomark.benchmark.runner import Runner
 from ekomark.data import operators
-from ekomark.banana_cfg import register
 
 register(__file__)
 
@@ -178,4 +179,4 @@ def benchmark_sv(self, pto):
     # obj.benchmark_plain(1)
     # obj.benchmark_sv(1)
     # obj.benchmark_kthr(2)
-    obj.benchmark_msbar(2)
+    obj.benchmark_msbar(0)
diff --git a/benchmarks/lha_paper_bench.py b/benchmarks/lha_paper_bench.py
@@ -3,6 +3,7 @@
 Benchmark to :cite:`Giele:2002hx` (LO + NLO) and :cite:`Dittmar:2005ed` (NNLO)
 """
 import numpy as np
+
 from ekomark.benchmark.runner import Runner
 
 base_theory = {

diff --git a/benchmarks/pegasus_bench.py b/benchmarks/pegasus_bench.py
@@ -4,6 +4,7 @@
 """
 import numpy as np
 from banana.data import cartesian_product
+
 from ekomark.benchmark.runner import Runner
 from ekomark.data import operators
 

diff --git a/benchmarks/sandbox.py b/benchmarks/sandbox.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # pylint: skip-file
 import numpy as np
+
+from ekomark import register
 from ekomark.benchmark.runner import Runner
 from ekomark.data import operators
-from ekomark import register
 
 register(__file__)
 

diff --git a/doc/source/theory/Matching.rst b/doc/source/theory/Matching.rst
@@ -120,5 +120,5 @@ EKO implements two different strategies to perform this operation, that can be s
     \mathbf{A}_{exp}^{-1}(\mu_{h}^2) &= \mathbf{I} - a_s(\mu_{h}^2)  \mathbf{A}^{(1)} + a_s^2(\mu_{h}^2) \left [ \mathbf{A}^{(2)} -  \left(\mathbf{A}^{(1)}\right)^2 \right ] + O(a_s^3) \\
 
 We emphasize that in the backward evolution, below the threshold, the remaining high quark PDFs are always intrinsic and do not evolve anymore.
-In fact, if the initial PDFs (above threshold) do contain an intrinsic contribution, this has to be evolved below the threshold otherwise momentum sum rules 
+In fact, if the initial PDFs (above threshold) do contain an intrinsic contribution, this has to be evolved below the threshold otherwise momentum sum rules
 can be violated.