Python interface improvements

examples/appl2pine/appl2pine.cpp

@@ -444,9 +444,9 @@ pineappl_grid* convert_grid(appl::grid& grid, bool reweight)
     auto const& results = grid.vconvolute(evolvepdf, evolvepdf, alphaspdf, 1);
     std::vector<double> other_results(results.size());
 
-    pineappl_grid_convolute(
+    pineappl_grid_convolute_with_one(
         grids.at(0),
-        xfx,
+        2212,
         xfx,
         alphas,
         pdf.get(),

examples/cpp/dyaa.cpp

@@ -137,7 +137,7 @@ int main() {
     };
 
     std::vector<double> dxsec(24);
-    pineappl_grid_convolute(grid, xfx, xfx, alphas, pdf, nullptr,
+    pineappl_grid_convolute_with_one(grid, 2212, xfx, alphas, pdf, nullptr,
         nullptr, 1.0, 1.0, dxsec.data());
 
     // print the results

examples/fnlo2pine/fnlo2pine.cpp

@@ -550,8 +550,6 @@ int main(int argc, char* argv[])
 
     std::vector<pineappl_grid*> grids;
 
-    std::size_t pdfs = 0;
-
     for (auto const id : ids)
     {
         auto coeff_table = file.GetCoeffTable(id);
@@ -561,7 +559,6 @@ int main(int argc, char* argv[])
 
         if (converted != nullptr)
         {
-            pdfs = converted->GetNPDF();
             grids.push_back(convert_coeff_add_fix(converted, file, bins, alpha));
         }
         else
@@ -570,7 +567,6 @@ int main(int argc, char* argv[])
 
             if (converted != nullptr)
             {
-                pdfs = converted->GetNPDF();
                 auto const mur_ff = file.GetMuRFunctionalForm();
                 auto const muf_ff = file.GetMuFFunctionalForm();
 
@@ -612,10 +608,10 @@ int main(int argc, char* argv[])
     auto const& results = file.GetCrossSection();
     std::vector<double> other_results(results.size());
 
-    pineappl_grid_convolute(
+    pineappl_grid_convolute_with_one(
         grids.at(0),
+        2212,
         xfx,
-        pdfs == 2 ? xfx : xfx2,
         alphas,
         pdf.get(),
         nullptr,

examples/python/dyaa.py

@@ -157,8 +157,9 @@ def main(calls, pdfname, filename):
         import lhapdf  # pylint: disable=import-outside-toplevel
 
         pdf = lhapdf.mkPDF(pdfname, 0)
+        pdg_id = int(pdf.set().get_entry('Particle'))
         # perform convolution
-        dxsec = grid.convolute(pdf.xfxQ2, pdf.xfxQ2, pdf.alphasQ2)
+        dxsec = grid.convolute_with_one(pdg_id, pdf.xfxQ2, pdf.alphasQ2)
         for i in range(len(dxsec)):
             print(f"{bins[i]:.1f} {bins[i + 1]:.1f} {dxsec[i]:.3e}")
 

pineappl/Cargo.toml

@@ -11,21 +11,21 @@ categories = ["science"]
 description = "PineAPPL is not an extension of APPLgrid"
 
 [dependencies]
-anyhow = "1.0"
 arrayvec = "0.5"
 bincode = "1.0"
 enum_dispatch = "0.3.5"
 float-cmp = "0.8"
 git-version = "0.3"
 itertools = "0.10"
-lz-fear = "0.1"
+lz4_flex = "0.8.2"
 ndarray = { features = ["serde"], version = "0.15.3" }
 rustc-hash = "1.1.0"
 serde = { features = ["derive"], version = "1.0" }
 thiserror = "1.0"
 indicatif = "0.15.0"
 
 [dev-dependencies]
+anyhow = "1.0"
 lhapdf = "0.1.8"
 rand = { default-features = false, version = "0.7" }
 rand_pcg = { default-features = false, version = "0.2" }

pineappl/src/fk_table.rs

@@ -1,6 +1,7 @@
 //! Provides the [`FkTable`] type.
 
-use super::grid::{Grid, Order};
+use super::grid::{Grid, GridError, Order};
+use super::lumi::LumiCache;
 use super::subgrid::Subgrid;
 use ndarray::Array4;
 use std::convert::TryFrom;
@@ -139,22 +140,28 @@ impl FkTable {
     /// # Errors
     ///
     /// TODO
-    pub fn write(&self, writer: impl Write) -> anyhow::Result<()> {
+    pub fn write(&self, writer: impl Write) -> Result<(), GridError> {
         self.grid.write(writer)
     }
 
+    /// Propagate `write_lz4` to `Grid`.
+    ///
+    /// # Errors
+    ///
+    /// See [`Grid::write_lz4`].
+    pub fn write_lz4(&self, writer: impl Write) -> Result<(), GridError> {
+        self.grid.write_lz4(writer)
+    }
+
     /// Propagate convolute to grid
     pub fn convolute(
         &self,
-        xfx1: &dyn Fn(i32, f64, f64) -> f64,
-        xfx2: &dyn Fn(i32, f64, f64) -> f64,
-        order_mask: &[bool],
+        lumi_cache: &mut LumiCache,
         bin_indices: &[usize],
         lumi_mask: &[bool],
-        xi: &[(f64, f64)],
     ) -> Vec<f64> {
         self.grid
-            .convolute(xfx1, xfx2, &|_| 1.0, order_mask, bin_indices, lumi_mask, xi)
+            .convolute(lumi_cache, &[], bin_indices, lumi_mask, &[(1.0, 1.0)])
     }
 }