Merge pull request #297 from NNPDF/update_pineappl

Update `pineappl 0.8.2`
NNPDF · Jul 24, 2024 · cf9b135 · cf9b135
2 parents 953dce2 + c5b88a7
commit cf9b135
Show file tree

Hide file tree

Showing 17 changed files with 499 additions and 490 deletions.
diff --git a/docs/source/implementation/kernels.rst b/docs/source/implementation/kernels.rst
@@ -2,7 +2,7 @@ Kernels
 =======
 
 The coefficient functions consist of the partonic cross-sections, that have to
-be convoluted with the PDFs in order to obtain the hadronic structure functions,
+be convolved with the PDFs in order to obtain the hadronic structure functions,
 according to the factorization theorem:
 
 .. math::

diff --git a/docs/source/implementation/scale-variations.rst b/docs/source/implementation/scale-variations.rst
@@ -58,16 +58,16 @@ scale variation formula <theory/scale-variations:Factorization>`.
 
 What is done in ``yadism`` is to implement everything to depend only on the
 *original* coefficients :math:`\textbf{c}_a^{(i)}`, and not to depend recursively
-on the convoluted ones :math:`\textbf{c}_a^{(i,j)}`, in order to limit the number
+on the convolved ones :math:`\textbf{c}_a^{(i,j)}`, in order to limit the number
 of extra numerical convolutions to a single one.
 
 In this case we are avoiding the disadvantages of the previous section, only
 partially paying for giving up on of the advantages: these convolutions would
 involve only splitting functions, and never the coefficient functions'
 expressions, and for this same reason they are also considerably easier.
 
-Applying convoluted kernels
----------------------------
+Applying convolved kernels
+--------------------------
 
 Since the convolutions are done numerically it is needed to integrate ahead of
 time the full operator: indeed the splitting functions act as operator on
@@ -148,7 +148,7 @@ in the theory section.
 
 Without the scale variations the interpolation is done completely on the |PDF|,
 as described in :doc:`interpolation`, and the interpolation polynomials would
-then be used to convolute numerically the coefficient functions:
+then be used to convolve numerically the coefficient functions:
 
 .. math::
 

diff --git a/docs/source/implementation/structure.rst b/docs/source/implementation/structure.rst
@@ -47,7 +47,7 @@ Essentially the flow of an execution is the following:
    :class:`~yadism.coefficient_functions.Combiner` for the relevant
    :class:`~yadism.coefficient_functions.kernels.Kernel`
 7. all the :class:`~yadism.coefficient_functions.kernels.Kernel` are numerically
-   convoluted with the |PDF| interpolation polynomials
+   convolved with the |PDF| interpolation polynomials
 8. all the results are collected in an :class:`~yadism.output.Output` object and
    returned to the user
 9. (**user** initiated) the :class:`~yadism.output.Output` object might be

diff --git a/docs/source/overview/tutorials/compare_data.ipynb b/docs/source/overview/tutorials/compare_data.ipynb
diff --git a/docs/source/overview/tutorials/getting_started.ipynb b/docs/source/overview/tutorials/getting_started.ipynb
diff --git a/docs/source/theory/coeff-funcs.rst b/docs/source/theory/coeff-funcs.rst
@@ -66,7 +66,7 @@ for variable flavor scheme like FONLL.
 Distributions
 -------------
 
-To obtain a physical observable one has to convolute the coefficient functions with the |PDF|
+To obtain a physical observable one has to convolve the coefficient functions with the |PDF|
 
 .. math ::
     \sigma = \sum_j f_j \otimes c_j = \sum_j \int\limits_x^1 \frac {dz}{z} f_j(x/z) c_j(z)

diff --git a/docs/source/theory/scale-variations.rst b/docs/source/theory/scale-variations.rst
@@ -71,7 +71,7 @@ Where :math:`a` (:math:`= 1,2,3,L`) is the kind of structure functions considere
 Than the explicit coefficient functions can be computed from |DGLAP| and
 :math:`\alpha_s` running (see :cite:`nnlo-sv-singlet,nnlo-sv-nonsinglet`),
 resulting in process and kind independent elements (the actual anomalous
-dimension of the two runnings) convoluted with lower order coefficient
+dimension of the two runnings) convolved with lower order coefficient
 functions:
 
 .. math::

diff --git a/extras/fonll_hq_treatment/kDISbThr.py b/extras/fonll_hq_treatment/kDISbThr.py
@@ -63,7 +63,7 @@ def plot_q2_grid(kDISbThrs: dict, obs_suffix: str):
     for tid, kDISbThr in kDISbThrs.items():
         gp = pathlib.Path(f"./grids/{tid}/{obsfn}.pineappl.lz4")
         g = pineappl.grid.Grid.read(gp)
-        conv = g.convolute_with_one(2212, p.xfxQ2, p.alphasQ2)
+        conv = g.convolve_with_one(2212, p.xfxQ2, p.alphasQ2)
         data.append(conv)
         q2s = g.bin_left(0)
         xs = g.bin_left(1)
@@ -96,7 +96,7 @@ def plot_q2_fk(kDISbThrs: dict, obs_suffix: str):
     for tid, kDISbThr in kDISbThrs.items():
         gp = pathlib.Path(f"./fktables/{tid}/{obsfn}.pineappl.lz4")
         g = pineappl.fk_table.FkTable.read(gp)
-        conv = g.convolute_with_one(2212, p.xfxQ2)
+        conv = g.convolve_with_one(2212, p.xfxQ2)
         data.append(conv)
         q2s = g.bin_left(0)
         xs = g.bin_left(1)