reflect changes to python interface

NNPDF · May 30, 2024 · 95b3bc3 · 95b3bc3
1 parent 1962fe2
commit 95b3bc3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/pineappl/src/grid.rs b/pineappl/src/grid.rs
@@ -1385,6 +1385,7 @@ impl Grid {
     }
 
     /// TODO: Fix to account for the different EKOs
+    /// TODO: Does the info have to be different?
     /// Converts this `Grid` into an [`FkTable`] using an evolution kernel operator (EKO) given as
     /// `operator`. The dimensions and properties of this operator must be described using `info`.
     /// The parameter `order_mask` can be used to include or exclude orders from this operation,
@@ -1398,14 +1399,15 @@ impl Grid {
     #[deprecated(since = "0.7.4", note = "use evolve_with_slice_iter instead")]
     pub fn evolve(
         &self,
-        operator: ArrayView5<f64>,
+        operator_a: ArrayView5<f64>,
+        operator_b: ArrayView5<f64>,
         info: &OperatorInfo,
         order_mask: &[bool],
     ) -> Result<FkTable, GridError> {
         self.evolve_with_slice_iter(
             info.fac1
                 .iter()
-                .zip(operator.axis_iter(Axis(0)))
+                .zip(operator_a.axis_iter(Axis(0)))
                 .map(|(&fac1, op)| {
                     Ok::<_, GridError>((
                         OperatorSliceInfo {
@@ -1422,7 +1424,7 @@ impl Grid {
                 }),
             info.fac1
                 .iter()
-                .zip(operator.axis_iter(Axis(0)))
+                .zip(operator_b.axis_iter(Axis(0)))
                 .map(|(&fac1, op)| {
                     Ok::<_, GridError>((
                         OperatorSliceInfo {

diff --git a/pineappl_py/pineappl/grid.py b/pineappl_py/pineappl/grid.py
@@ -344,6 +344,7 @@ def evolve(
             self.raw.evolve(
                 np.array(operator_grid),
                 operators["q2_ref"],
+                operators["q2_ref"], # TODO: Modify the input EKO
                 np.array(operators["inputpids"], dtype=np.int32),
                 np.array(operators["inputgrid"]),
                 np.array(q2grid, dtype=np.float64),

diff --git a/pineappl_py/src/grid.rs b/pineappl_py/src/grid.rs
@@ -458,7 +458,8 @@ impl PyGrid {
     ///     produced FK table
     pub fn evolve(
         &self,
-        operator: PyReadonlyArray5<f64>,
+        operator_a: PyReadonlyArray5<f64>,
+        operator_b: PyReadonlyArray5<f64>,
         fac0: f64,
         pids0: PyReadonlyArray1<i32>,
         x0: PyReadonlyArray1<f64>,
@@ -488,7 +489,8 @@ impl PyGrid {
         let evolved_grid = self
             .grid
             .evolve(
-                operator.as_array(),
+                operator_a.as_array(),
+                operator_b.as_array(),
                 &op_info,
                 order_mask.as_slice().unwrap(),
             )