Replace OperatorCallback.ConvType in favor of OperatorCallback.usize

Author: Radonirinaunimi

examples/cpp/evolve-grid-identity.cpp

@@ -13,6 +13,13 @@
 // NOTE: Uses the scale of the Grid as the starting scale such that we can use an IDENTITY EKO.
 double FAC0 = 6456.44;
 
+/** @brief This struct can contain arbitrary parameters that need to be passed to Evolution
+ * Operator Callback (`generated_fake_ekos`).
+ */
+struct OperatorParams {
+    std::vector<pineappl_conv_type> conv_types;
+};
+
 std::vector<std::size_t> unravel_index(std::size_t flat_index, const std::vector<std::size_t>& shape) {
     std::size_t ndim = shape.size();
     std::vector<std::size_t> coords(ndim);
@@ -26,7 +33,7 @@ std::vector<std::size_t> unravel_index(std::size_t flat_index, const std::vector
 }
 
 extern "C" void generate_fake_ekos(
-    pineappl_conv_type /*conv_type*/,
+    std::size_t op_index,
     double /*fac1*/,
     const int* /*pids_in*/,
     const double* /*x_in*/,
@@ -36,8 +43,9 @@ extern "C" void generate_fake_ekos(
     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();
+    // select the type of convolution based on the Operator index
+    OperatorParams* op_params = static_cast<OperatorParams*>(params_state);
+    pineappl_conv_type _ = op_params->conv_types[op_index];
 
     // NOTE: This has to work because the Evolution Operator is always 4D
     std::vector<std::size_t> shape(eko_shape, eko_shape + 4);
@@ -152,6 +160,7 @@ int main() {
     // ------------------ Construct the Operator Info ------------------
     // The Operator Info is a vector with length `N_conv * N_Q2_slices` whose
     // elements are `OperatorInfo` objects.
+    std::vector<pineappl_conv_type> convtypes(unique_convs.size());
     std::vector<pineappl_operator_info> opinfo_slices(unique_convs.size() * fac1.size());
     for (std::size_t i = 0; i != unique_convs.size(); i++) {
         for (std::size_t j = 0; j != fac1.size(); j++) {
@@ -163,6 +172,7 @@ int main() {
             };
             opinfo_slices[i * fac1.size() + j] = opinfo;
         }
+        conv_types[i] = unique_convs[i];
     }
 
     // ------------------ Construct the Evolution Operator ------------------
@@ -177,6 +187,11 @@ int main() {
         alphas_table.push_back(alpha);
     }
 
+    // Construct the Parameters that will get passed to the Callback
+    OperatorParams* op_params = new OperatorParams;
+    op_params->conv_types = convtypes;
+    void* params = static_cast<void*>(op_params);
+
     std::vector<double> xi = {1.0, 1.0, 1.0};
     // NOTE: The EKO has to have as shape: (pids_in, x_in, pids_out, x_out)
     std::vector<std::size_t> tensor_shape = {pids_in.size(), x_in.size(), pids_out.size(), x_in.size()};
@@ -207,7 +222,7 @@ int main() {
         pids_out.data(),      // `pids_out`
         x_in.data(),          // `x_out`
         tensor_shape.data(),  // `eko_shape`
-        pdf.get(),            // `state`
+        params,               // `state`
         nullptr,              // `order_mask`
         xi.data(),            // `xi`
         ren1.data(),          // `ren1`

examples/cpp/evolve-grid.cpp

@@ -70,6 +70,13 @@ std::vector<double> XGRID = {
 // Particle PIDs for both `in` and `out`
 std::vector<int> PIDS = {- 22 , -6 , -5 , -4 , -3 , -2 , -1 , 21 , 1 , 2 , 3 , 4 , 5 , 6};
 
+/** @brief This struct can contain arbitrary parameters that need to be passed to Evolution
+ * Operator Callback (`generated_fake_ekos`).
+ */
+struct OperatorParams {
+    std::vector<pineappl_conv_type> conv_types;
+};
+
 std::vector<std::size_t> unravel_index(std::size_t flat_index, const std::vector<std::size_t>& shape) {
     std::size_t ndim = shape.size();
     std::vector<std::size_t> coords(ndim);
@@ -83,7 +90,7 @@ std::vector<std::size_t> unravel_index(std::size_t flat_index, const std::vector
 }
 
 extern "C" void generate_fake_ekos(
-    pineappl_conv_type /*conv_type*/,
+    std::size_t op_index,
     double /*fac1*/,
     const int* /*pids_in*/,
     const double* /*x_in*/,
@@ -93,8 +100,9 @@ extern "C" void generate_fake_ekos(
     double* eko_buffer,
     void* params_state
 ) {
-    // Check to get the μ0 from the PDF
-    const double _ = static_cast<LHAPDF::PDF*> (params_state)->q2Min();
+    // select the type of convolution based on the Operator index
+    OperatorParams* op_params = static_cast<OperatorParams*>(params_state);
+    pineappl_conv_type _ = op_params->conv_types[op_index];
 
     std::ifstream input_file("../../test-data/EKO_LHCB_WP_7TEV.txt");
     double weight_value;
@@ -203,6 +211,7 @@ int main() {
     // ------------------ Construct the Operator Info ------------------
     // The Operator Info is a vector with length `N_conv * N_Q2_slices` whose
     // elements are `OperatorInfo` objects.
+    std::vector<pineappl_conv_type> convtypes(unique_convs.size());
     std::vector<pineappl_operator_info> opinfo_slices(unique_convs.size() * fac1.size());
     for (std::size_t i = 0; i != unique_convs.size(); i++) {
         for (std::size_t j = 0; j != fac1.size(); j++) {
@@ -214,6 +223,7 @@ int main() {
             };
             opinfo_slices[i * fac1.size() + j] = opinfo;
         }
+        conv_types[i] = unique_convs[i];
     }
 
     // ------------------ Construct the Evolution Operator ------------------
@@ -228,6 +238,11 @@ int main() {
         alphas_table.push_back(alpha);
     }
 
+    // Construct the Parameters that will get passed to the Callback
+    OperatorParams* op_params = new OperatorParams;
+    op_params->conv_types = convtypes;
+    void* params = static_cast<void*>(op_params);
+
     std::vector<double> xi = {1.0, 1.0, 1.0};
     // NOTE: The EKO has to have as shape: (pids_in, x_in, pids_out, x_out)
     std::vector<std::size_t> tensor_shape = {pids_in.size(), XGRID.size(), pids_out.size(), XGRID.size()};
@@ -258,7 +273,7 @@ int main() {
         pids_out.data(),      // `pids_out`
         XGRID.data(),         // `x_out`
         tensor_shape.data(),  // `eko_shape`
-        pdf.get(),            // `state`
+        params,               // `state`
         nullptr,              // `order_mask`
         xi.data(),            // `xi`
         ren1.data(),          // `ren1`

pineappl_capi/src/lib.rs

@@ -2139,7 +2139,7 @@ pub unsafe extern "C" fn pineappl_grid_evolve_info(
 
 /// Type alias for the operator callback
 pub type OperatorCallback = unsafe extern "C" fn(
-    ConvType,     // Convolution type
+    usize,        // index which selects Evolution parameters
     f64,          // fac1
     *const i32,   // `pids_in`
     *const f64,   // `x_in`
@@ -2228,7 +2228,7 @@ pub unsafe extern "C" fn pineappl_grid_evolve(
 
     let op_slices = operator_info
         .map(|op_infos| {
-            op_infos.iter().map(|op_info| {
+            op_infos.iter().enumerate().map(|(op_index, op_info)| {
                 let operator_slice_info = OperatorSliceInfo {
                     pid_basis: op_info.pid_basis,
                     fac0: op_info.fac0,
@@ -2244,7 +2244,7 @@ pub unsafe extern "C" fn pineappl_grid_evolve(
 
                 unsafe {
                     slices(
-                        op_info.conv_type,
+                        op_index,
                         op_info.fac1,
                         pids_in.as_ptr(),
                         x_in.as_ptr(),