Re-order the parameters of the OperatorCallback struct

Author: Radonirinaunimi

examples/cpp/evolve-grid-identity.cpp

@@ -25,18 +25,18 @@ std::vector<std::size_t> unravel_index(std::size_t flat_index, const std::vector
 }
 
 extern "C" void generate_fake_ekos(
-    const int* /*pids_in*/,
-    const double* /*x_in*/,
-    const int* /*pids_out*/,
-    const double* /*x_out*/,
-    double* eko_buffer,
-    void* params_state,
     pineappl_conv_type /*conv_type*/,
     double /*fac1*/,
     std::size_t pids_in_len,
+    const int* /*pids_in*/,
     std::size_t x_in_len,
+    const double* /*x_in*/,
     std::size_t pids_out_len,
-    std::size_t x_out_len
+    const int* /*pids_out*/,
+    std::size_t x_out_len,
+    const double* /*x_out*/,
+    double* eko_buffer,
+    void* params_state
 ) {
     // Check to get the μ0 of the PDF from the `params_state`
     const double _ = static_cast<LHAPDF::PDF*> (params_state)->q2Min();

examples/cpp/evolve-grid.cpp

@@ -83,18 +83,18 @@ std::vector<std::size_t> unravel_index(std::size_t flat_index, const std::vector
 }
 
 extern "C" void generate_fake_ekos(
-    const int* /*pids_in*/,
-    const double* /*x_in*/,
-    const int* /*pids_out*/,
-    const double* /*x_out*/,
-    double* eko_buffer,
-    void* params_state,
     pineappl_conv_type /*conv_type*/,
     double /*fac1*/,
     std::size_t /*pids_in_len*/,
+    const int* /*pids_in*/,
     std::size_t /*x_in_len*/,
+    const double* /*x_in*/,
     std::size_t /*pids_out_len*/,
-    std::size_t /*x_out_len*/
+    const int* /*pids_out*/,
+    std::size_t /*x_out_len*/,
+    const double* /*x_out*/,
+    double* eko_buffer,
+    void* params_state
 ) {
     // Check to get the μ0 from the PDF
     const double _ = static_cast<LHAPDF::PDF*> (params_state)->q2Min();

pineappl_capi/src/lib.rs

@@ -2139,18 +2139,18 @@ pub unsafe extern "C" fn pineappl_grid_evolve_info(
 
 /// Type alias for the operator callback
 pub type OperatorCallback = unsafe extern "C" fn(
-    *const i32,  // pids_in
-    *const f64,  // x_in
-    *const i32,  // pids_out
-    *const f64,  // x_out
-    *mut f64,    // Evolution Operator data buffer
-    *mut c_void, // Callable of PDF object
     ConvType,    // Convolution type
     f64,         // fac1
-    usize,       // Length of pids_in
-    usize,       // Length of x_in
-    usize,       // Length of pids_out
-    usize,       // Length of x_out
+    usize,       // size of `pids_in`
+    *const i32,  // `pids_in`
+    usize,       // size of `x_in`
+    *const f64,  // `x_in`
+    usize,       // size of `pids_out`
+    *const i32,  // `pids_out`
+    usize,       // size of `x_out`
+    *const f64,  // `x_out`
+    *mut f64,    // Evolution Operator data buffer
+    *mut c_void, // Callable state of parameters
 );
 
 /// Evolve a grid with an evolution operator and dump the resulting FK table.
@@ -2247,22 +2247,22 @@ pub unsafe extern "C" fn pineappl_grid_evolve(
 
                 unsafe {
                     slices(
+                        op_info.conv_type,
+                        op_info.fac1,
+                        pids_in.len(),
                         pids_in.as_ptr(),
+                        x_in.len(),
                         x_in.as_ptr(),
+                        pids_out.len(),
                         pids_out.as_ptr(),
+                        x_out.len(),
                         x_out.as_ptr(),
                         array
                             .as_slice_mut()
                             // UNWRAP: `array` is by construction contiguous and in standard order
                             .unwrap()
                             .as_mut_ptr(),
                         state,
-                        op_info.conv_type,
-                        op_info.fac1,
-                        pids_in.len(),
-                        x_in.len(),
-                        pids_out.len(),
-                        x_out.len(),
                     );
                 }