From ee3b603fcf05aa51e58c063caeded6cccf3c0150 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 21:55:55 +0000 Subject: [PATCH 1/4] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/asottile/blacken-docs: 1.15.0 → 1.16.0](https://github.com/asottile/blacken-docs/compare/1.15.0...1.16.0) - [github.com/pre-commit/pre-commit: v3.3.3 → v3.4.0](https://github.com/pre-commit/pre-commit/compare/v3.3.3...v3.4.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 028417fb..c8e66397 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: hooks: - id: black - repo: https://github.com/asottile/blacken-docs - rev: 1.15.0 + rev: 1.16.0 hooks: - id: blacken-docs - repo: https://github.com/pycqa/isort @@ -44,6 +44,6 @@ repos: additional_dependencies: - toml - repo: https://github.com/pre-commit/pre-commit - rev: v3.3.3 + rev: v3.4.0 hooks: - id: validate_manifest From 408ff0090ba5b3003a298926c228b47c8335d21f Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Thu, 7 Sep 2023 10:07:39 +0200 Subject: [PATCH 2/4] Remove extra-factor of 2 --- src/yadism/esf/exs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yadism/esf/exs.py b/src/yadism/esf/exs.py index 7f896033..faf1f2a8 100644 --- a/src/yadism/esf/exs.py +++ b/src/yadism/esf/exs.py @@ -68,7 +68,7 @@ def xs_coeffs(kind, y, x=None, Q2=None, params=None): yL = y**2 / (2 * (y**2 / 2 + (1 - y) - (mn * x * y) ** 2 / Q2)) elif kind == "XSFPFCC": INV_GEV_TO_PB = GEV_CM2_CONV / 100.0 # pb - norm = (INV_GEV_TO_PB * params["GF"] ** 2) / (4.0 * np.pi) + norm = (INV_GEV_TO_PB * params["GF"] ** 2) / (2.0 * np.pi) norm *= 1.0 / (2.0 * x * (1.0 + Q2 / params["M2W"]) ** 2) else: mn = np.sqrt(params["M2target"]) From 90e9966d4ab5a4a291a1abc7d7a4d4af84d3b87d Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Thu, 7 Sep 2023 10:11:55 +0200 Subject: [PATCH 3/4] Fix test accordingly --- tests/yadism/esf/test_exs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/yadism/esf/test_exs.py b/tests/yadism/esf/test_exs.py index 25286f6d..b7974595 100644 --- a/tests/yadism/esf/test_exs.py +++ b/tests/yadism/esf/test_exs.py @@ -57,7 +57,7 @@ def test_xs_coeffs(): y=1.0, params=dict(projectilePID=1, M2target=0.0, M2W=1.0, GF=1.0), ) - assert xsfpfcc[0] == 3.893793e8 / (32.0 * 0.5 * np.pi) + assert xsfpfcc[0] == 3.893793e8 / (16.0 * 0.5 * np.pi) nutev = xs_coeffs( "XSNUTEVCC", From fa1e0b39869caedf9565dd9fd52d0cd17f4899fb Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 22:19:56 +0000 Subject: [PATCH 4/4] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/psf/black: 23.7.0 → 23.9.1](https://github.com/psf/black/compare/23.7.0...23.9.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c8e66397..bbcaa19e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: debug-statements exclude: "debug.py" - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: - id: black - repo: https://github.com/asottile/blacken-docs