Skip to content

Commit e98971a

Browse files
committed
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
2 parents d02dbe8 + 14da857 commit e98971a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+720
-713
lines changed

.github/CONTRIBUTING.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:tada: Thanks, for considering to contribute to EKO!
44

55
:pray: For the sake of simplicity we switch below to imperative
6-
language, however, please read a "Please" infront of everything.
6+
language, however, please read a "Please" in front of everything.
77

88
- :brain: Be reasonable and use common sense when contributing: we
99
added some points we would like to highlight below
@@ -14,19 +14,18 @@ language, however, please read a "Please" infront of everything.
1414

1515
## Tools
1616

17-
- [`poetry`](https://github.com/python-poetry/poetry) is the
17+
- :books: [`poetry`](https://github.com/python-poetry/poetry) is the
1818
dependency manager and packaging back-end of choice for this
19-
project, refers to official [installation
19+
project - see the official [installation
2020
guide](https://python-poetry.org/docs/#installation)
21-
- [`poery-dynamic-versioning`](https://github.com/mtkennerly/poetry-dynamic-versioning),
21+
- :hash: [`poery-dynamic-versioning`](https://github.com/mtkennerly/poetry-dynamic-versioning),
2222
is used to update the package version based on VCS status (tags and
2323
commits); note that since the version is dumped in output object,
2424
this is to be used not only for releases, but whenever output is
2525
generated (and intended to be used)
26-
- [`pre-commit`](https://pre-commit.com/) is used to enforce
26+
- :parking: [`pre-commit`](https://pre-commit.com/) is used to enforce
2727
automation and standardize the tools for all developers; if you want
28-
to contribute to this project, please
29-
[install](https://pre-commit.com/#install) it and \[setup\]
28+
to contribute to this project, install it and setup
3029

3130
## Testing
3231

.github/workflows/unittests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: unit tests
1+
name: tests
22

33
on:
44
push:

.pre-commit-config.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,29 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.0.1
5+
rev: v4.1.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- id: check-yaml
10+
- id: check-toml
11+
- id: check-merge-conflict
12+
- id: debug-statements
13+
- id: fix-encoding-pragma
1014
- repo: https://github.com/psf/black
11-
rev: 21.6b0
15+
rev: 22.1.0
1216
hooks:
1317
- id: black
18+
- repo: https://github.com/asottile/blacken-docs
19+
rev: v1.12.1
20+
hooks:
21+
- id: blacken-docs
1422
- repo: https://github.com/pycqa/isort
15-
rev: 5.9.1
23+
rev: 5.10.1
1624
hooks:
1725
- id: isort
1826
args: ["--profile", "black"]
27+
- repo: https://github.com/asottile/pyupgrade
28+
rev: v2.31.0
29+
hooks:
30+
- id: pyupgrade

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<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>
33
</p>
44
<p align="center">
5-
<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>
5+
<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>
66
<a href="https://eko.readthedocs.io/en/latest/?badge=latest"><img alt="Docs" src="https://readthedocs.org/projects/eko/badge/?version=latest"></a>
77
<a href="https://codecov.io/gh/N3PDF/eko"><img src="https://codecov.io/gh/N3PDF/eko/branch/master/graph/badge.svg" /></a>
88
<a href="https://www.codefactor.io/repository/github/n3pdf/eko"><img src="https://www.codefactor.io/repository/github/n3pdf/eko/badge" alt="CodeFactor" /></a>
99
</p>
1010

11-
EKO is a Python module to solve the DGLAP equations in terms of Evolution Kernel Operators in x-space.
11+
EKO is a Python module to solve the DGLAP equations in N-space in terms of Evolution Kernel Operators in x-space.
1212

1313
## Installation
1414
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
2626
```
2727

2828
To setup `poetry`, and other tools, see [Contribution
29-
Guidlines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md).
29+
Guidelines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md).
3030

3131
## Documentation
3232
- 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>
3333
- To build the documentation from source install [graphviz](https://www.graphviz.org/) and run in addition to the installation commands
3434
```bash
35-
pip install -r dev_requirements.txt
36-
cd doc
37-
make html
35+
poe docs
3836
```
3937

4038
## Citation policy
41-
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>
39+
When using our code please cite
40+
- 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>
41+
- our paper: [![arXiv](https://img.shields.io/badge/arXiv-2202.02338-b31b1b?labelColor=222222)](https://arxiv.org/abs/2202.02338)
4242

4343
## Contributing
4444
- 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>
4545
- Please follow our [Code of Conduct](https://github.com/N3PDF/eko/blob/master/.github/CODE_OF_CONDUCT.md) and read the
46-
[Contribution Guidlines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md)
46+
[Contribution Guidelines](https://github.com/N3PDF/eko/blob/master/.github/CONTRIBUTING.md)

benchmarks/CT14_bench.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## -*- coding: utf-8 -*-
1+
# -*- coding: utf-8 -*-
22
"""
33
Benchmark CT14 pdf family
44

benchmarks/CT18_bench.py

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## -*- coding: utf-8 -*-
1+
# -*- coding: utf-8 -*-
22
"""
33
Benchmark CT18 pdf family
44
@@ -51,6 +51,29 @@ def benchmark_nnlo(self, Q0=1.295, Q2grid=(1e4,)):
5151
]
5252
self.run([theory_card], [operator_card], ["CT18NNLO"])
5353

54+
def benchmark_znnlo(self, Q0=1.3, Q2grid=(1e4,)):
55+
theory_card = base_theory.copy()
56+
theory_card.update(
57+
{
58+
"alphas": 0.118000,
59+
"PTO": 2,
60+
"Q0": Q0,
61+
"MaxNfPdf": 5,
62+
"MaxNfAs": 5,
63+
"mc": 1.4,
64+
}
65+
)
66+
operator_card = {"Q2grid": list(Q2grid)}
67+
self.skip_pdfs = lambda _theory: [
68+
-6,
69+
6,
70+
22,
71+
"ph",
72+
"T35",
73+
"V35",
74+
]
75+
self.run([theory_card], [operator_card], ["CT18ZNNLO"])
76+
5477

5578
if __name__ == "__main__":
5679
b = BenchmarkCT18()

benchmarks/HERA20_bench.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## -*- coding: utf-8 -*-
1+
# -*- coding: utf-8 -*-
22
"""
33
Benchmark HERAPDF2.0 pdf family
44

benchmarks/NNPDF_bench.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## -*- coding: utf-8 -*-
1+
# -*- coding: utf-8 -*-
22
"""
33
Benchmark NNDPF31 pdf family
44
"""

benchmarks/apfel_bench.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
Benchmark EKO to Apfel
44
"""
55
import numpy as np
6+
from banana import register
67
from banana.data import cartesian_product
8+
79
from ekomark.benchmark.runner import Runner
810
from ekomark.data import operators
9-
from ekomark.banana_cfg import register
1011

1112
register(__file__)
1213

@@ -178,4 +179,4 @@ def benchmark_sv(self, pto):
178179
# obj.benchmark_plain(1)
179180
# obj.benchmark_sv(1)
180181
# obj.benchmark_kthr(2)
181-
obj.benchmark_msbar(2)
182+
obj.benchmark_msbar(0)

benchmarks/lha_paper_bench.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Benchmark to :cite:`Giele:2002hx` (LO + NLO) and :cite:`Dittmar:2005ed` (NNLO)
44
"""
55
import numpy as np
6+
67
from ekomark.benchmark.runner import Runner
78

89
base_theory = {

0 commit comments

Comments
 (0)