diff --git a/pyproject.toml b/pyproject.toml index 5170d4f..ae49570 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ pkgconfig = "^1.5.5" pygit2 = "^1.12.0" requests = "^2.26.0" lhapdf-management = "^0.3" -pineappl = "^0.7.2" +pineappl = "^0.8.0" more-itertools = "^8.10.0" appdirs = "^1.4.4" tomli = "^2.0.1" diff --git a/src/pinefarm/cli/run.py b/src/pinefarm/cli/run.py index 16e44c9..96228ac 100644 --- a/src/pinefarm/cli/run.py +++ b/src/pinefarm/cli/run.py @@ -123,7 +123,7 @@ def run_dataset(runner): runner.generate_pineappl() table.print_table( - table.convolute_grid( + table.convolve_grid( runner.grid, runner.pdf, integrated=isinstance(runner, mg5.Mg5) ), runner.results(), diff --git a/src/pinefarm/external/interface.py b/src/pinefarm/external/interface.py index a3fa89a..f05517e 100644 --- a/src/pinefarm/external/interface.py +++ b/src/pinefarm/external/interface.py @@ -81,7 +81,7 @@ def generate_pineappl(self): Returns ------- str - output of ``pineappl convolute`` on the generate grid and selected + output of ``pineappl convolve`` on the generate grid and selected :attr:`pdf` """ diff --git a/src/pinefarm/table.py b/src/pinefarm/table.py index e5857df..2bbc606 100644 --- a/src/pinefarm/table.py +++ b/src/pinefarm/table.py @@ -9,8 +9,8 @@ from . import tools -def convolute_grid(grid, pdf_name, integrated=False): - """Call `convolute` via PineAPPL CLI. +def convolve_grid(grid, pdf_name, integrated=False): + """Call `convolve` via PineAPPL CLI. Parameters ---------- @@ -31,7 +31,7 @@ def convolute_grid(grid, pdf_name, integrated=False): pdf = lhapdf.mkPDF(pdf_name) loaded_grid = pineappl.grid.Grid.read(str(grid)) - pineappl_results = loaded_grid.convolute_with_one( + pineappl_results = loaded_grid.convolve_with_one( 2212, pdf.xfxQ2, pdf.alphasQ2, xi=tools.nine_points )