Skip to content

Commit

Permalink
Merge branch 'master' into tmc-pol
Browse files Browse the repository at this point in the history
  • Loading branch information
Radonirinaunimi committed Sep 12, 2023
2 parents 6f55294 + 9f55ca5 commit ea76b54
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ 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
rev: 1.15.0
rev: 1.16.0
hooks:
- id: blacken-docs
- repo: https://github.com/pycqa/isort
Expand All @@ -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
2 changes: 1 addition & 1 deletion src/yadism/esf/exs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
2 changes: 1 addition & 1 deletion tests/yadism/esf/test_exs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit ea76b54

Please sign in to comment.