Skip to content

Commit

Permalink
Merge branch 'main' into fkutils-move
Browse files Browse the repository at this point in the history
  • Loading branch information
felixhekhorn committed Mar 9, 2022
2 parents 1d3c2b7 + 89c1473 commit 68cd123
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
37 changes: 18 additions & 19 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ authors = [
[tool.poetry.dependencies]
python = ">=3.8,<3.11"
eko = "^0.8.5"
pineappl = "^0.5.0"
pineappl = "^0.5.1"
PyYAML = "^6.0"
numpy = "^1.21.0"
pandas = "^1.4.1"
Expand Down
1 change: 1 addition & 0 deletions src/pineko/evolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ def evolve_grid(
# do it
order_mask = pineappl.grid.Order.create_mask(pineappl_grid.orders(), max_as, max_al)
fktable = pineappl_grid.convolute_eko(operators, "evol", order_mask=order_mask)
fktable.optimize()
# write
fktable.write_lz4(str(fktable_path))
# compare before after
Expand Down

2 comments on commit 68cd123

@alecandido
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep in mind that this is still broken: there is no pineappl=0.5.1 actually released on PyPI.

@felixhekhorn
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, however I'll soon push another fix to pineappl

Please sign in to comment.