Add interfaces compatible with EKO v0.11.x

pineappl_py/pineappl/grid.py

@@ -1,4 +1,7 @@
+from typing import Sequence, Tuple
+
 import numpy as np
+import numpy.typing as npt
 
 from .fk_table import FkTable
 from .pineappl import PyGrid, PyOrder
@@ -245,16 +248,25 @@ def convolute_with_one(
             xi,
         )
 
-    def convolute_eko(self, operators, mur2_grid, alphas_values, lumi_id_types="pdg_mc_ids", order_mask=(), xi=(1.0, 1.0)):
+    def convolute_eko(
+        self,
+        operators: npt.NDArray,
+        muf2_grid: Sequence[float],
+        mur2_grid: Sequence[float],
+        alphas_values: Sequence[float],
+        lumi_id_types: str = "pdg_mc_ids",
+        order_mask: Sequence[float] = (),
+        xi: Tuple[float, float] = (1.0, 1.0),
+    ):
         """
         Create an FKTable with the EKO.
 
         Convenience wrapper for :meth:`pineappl.pineappl.PyGrid.convolute_eko()`.
 
         Parameters
         ----------
-            operators : dict
-                EKO Output
+            operators : np.ndarray
+                array containing the concatenation of EKO operators
             mur2_grid : list[float]
                 renormalization scales
             alphas_values : list[float]
@@ -277,10 +289,6 @@ def convolute_eko(self, operators, mur2_grid, alphas_values, lumi_id_types="pdg_
             PyFkTable :
                 raw grid as an FKTable
         """
-        operator_grid = np.array(
-            [op["operators"] for op in operators["Q2grid"].values()]
-        )
-        q2grid = list(operators["Q2grid"].keys())
         return FkTable(
             self.raw.convolute_eko(
                 operators["q2_ref"],
@@ -290,15 +298,23 @@ def convolute_eko(self, operators, mur2_grid, alphas_values, lumi_id_types="pdg_
                 np.array(operators["inputpids"], dtype=np.int32),
                 np.array(operators["inputgrid"]),
                 np.array(mur2_grid, dtype=np.float64),
-                np.array(q2grid, dtype=np.float64),
-                np.array(operator_grid),
+                np.array(muf2_grid, dtype=np.float64),
+                np.array(operators),
                 lumi_id_types,
                 np.array(order_mask, dtype=bool),
-                xi
+                xi,
             )
         )
 
-    def evolve(self, operators, mur2_grid, alphas_values, lumi_id_types="pdg_mc_ids", order_mask=(), xi=(1.0, 1.0)):
+    def evolve(
+        self,
+        operators,
+        mur2_grid,
+        alphas_values,
+        lumi_id_types="pdg_mc_ids",
+        order_mask=(),
+        xi=(1.0, 1.0),
+    ):
         """
         Create an FKTable with the EKO.