Fix C++ OOP interface and example

Author: Radonirinaunimi

examples/object-oriented-cpp/dyaa.cpp

@@ -5,7 +5,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
-#include <memory>
 #include <random>
 #include <vector>
 
@@ -108,9 +107,10 @@ int main() {
   // Name of the PDF sets to be used for the convolutions
   std::string pdfset1 = "NNPDF31_nlo_as_0118_luxqed";
   std::string pdfset2 = "MSHT20qed_nnlo";
+  const std::size_t nb_convolutions = 2;
 
   // --- create a new `Channels` function for the $\gamma\gamma$ initial state
-  PineAPPL::Channels channels;
+  PineAPPL::Channels channels(nb_convolutions);
   PineAPPL::SubChannelEntry subchannels;
   subchannels.entry.push_back({{22, 22}, 1.0});
   PineAPPL::ChannelsEntry channels_entry;
@@ -150,7 +150,7 @@ int main() {
   pineappl_map scales_mapping = PINEAPPL_MAP_APPL_GRID_H0;  // Mapping method
   pineappl_map moment_mapping = PINEAPPL_MAP_APPL_GRID_F2;
   pineappl_interp_meth interpolation_meth = PINEAPPL_INTERP_METH_LAGRANGE;
-  std::vector<pineappl_interp_tuples> interpolations = {
+  std::vector<pineappl_interp> interpolations = {
       {1e2, 1e8, 40, 3, scales_reweight, scales_mapping,
        interpolation_meth},  // Interpolation fo `scales`
       {2e-7, 1.0, 50, 3, moment_reweight, moment_mapping,

pineappl_capi/include/PineAPPL.hpp

@@ -41,7 +41,7 @@ struct Channels {
   pineappl_channels *raw;
 
   /** @brief Constructor. */
-  Channels() : raw(pineappl_channels_new()) {}
+  Channels(const std::size_t convolutions) : raw(pineappl_channels_new(convolutions)) {}
   Channels(const Channels &) = delete;
   Channels(Channels &&) = delete;
 
@@ -62,9 +62,6 @@ struct Channels {
     const std::size_t combinations = c.channels_entry.size();
     if (combinations == 0) return;
 
-    const std::size_t nb_convolutions =
-        c.channels_entry[0].entry[0].first.size();
-
     std::vector<std::int32_t> pids;
     std::vector<double> weights;
     for (const SubChannelEntry &s : c.channels_entry) {
@@ -75,8 +72,7 @@ struct Channels {
         weights.push_back(m.second);
       }
     }
-    pineappl_channels_add(this->raw, combinations, nb_convolutions, pids.data(),
-                          weights.data());
+    pineappl_channels_add(this->raw, combinations, pids.data(), weights.data());
   }
 
   /**
@@ -154,12 +150,15 @@ struct Grid {
    * @param bin_limits bin_limits
    * @param mu_scales indexes representing the scales
    */
-  Grid(std::vector<Order> &orders, const Channels &channels,
-       pineappl_pid_basis pid_basis, std::vector<int32_t> pids,
+  Grid(std::vector<Order> &orders,
+       const Channels &channels,
+       pineappl_pid_basis pid_basis,
+       std::vector<int32_t> pids,
        std::vector<pineappl_conv_type> &convolution_types,
        std::vector<pineappl_kinematics> &kinematics,
-       std::vector<pineappl_interp_tuples> &interp,
-       std::vector<double> &bin_limits, std::vector<std::size_t> &mu_scales)
+       std::vector<pineappl_interp> &interp,
+       std::vector<double> &bin_limits,
+       std::vector<std::size_t> &mu_scales)
       : Grid(nullptr) {
     const std::size_t n_orders = orders.size();
     const std::size_t n_bins = bin_limits.size() - 1;
@@ -186,9 +185,9 @@ struct Grid {
     }
 
     this->raw = pineappl_grid_new2(
-        pid_basis, channels.raw, n_orders, raw_orders.data(), n_bins,
-        bin_limits.data(), n_convs, convolution_types.data(), pids.data(),
-        kinematics.data(), interp.data(), mu_scales.data());
+        n_bins, bin_limits.data(), n_orders, raw_orders.data(), channels.raw,
+        pid_basis, convolution_types.data(), pids.data(), interp.size(),
+        interp.data(), kinematics.data(), mu_scales.data());
   }
 
   /**