Merge branch 'master' into expose-evolve-capi

Author: Radonirinaunimi

Cargo.lock

@@ -22,7 +22,7 @@ keywords = ["high-energy-physics", "physics"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/NNPDF/pineappl"
 rust-version = "1.80.1"
-version = "1.0.0-alpha4"
+version = "1.0.0-alpha5"
 
 [workspace.lints.clippy]
 all = { level = "warn", priority = -1 }

Cargo.toml

@@ -16,7 +16,7 @@ version.workspace = true
 workspace = true
 
 [dependencies]
-pineappl = { path = "../pineappl", version = "=1.0.0-alpha4" }
+pineappl = { path = "../pineappl", version = "=1.0.0-alpha5" }
 itertools = "0.10.1"
 ndarray = "0.15.4"
 

pineappl_capi/Cargo.toml

@@ -30,9 +30,9 @@ lhapdf = { package = "managed-lhapdf", version = "0.3.4" }
 lz4_flex = { optional = true, version = "0.9.2" }
 ndarray = "0.15.4"
 ndarray-npy = { optional = true, version = "0.8.1" }
-pineappl = { path = "../pineappl", version = "=1.0.0-alpha4" }
-pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.0.0-alpha4" }
-pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.0.0-alpha4" }
+pineappl = { path = "../pineappl", version = "=1.0.0-alpha5" }
+pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.0.0-alpha5" }
+pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.0.0-alpha5" }
 prettytable-rs = { default-features = false, features = ["win_crlf"], version = "0.10.0" }
 rayon = "1.5.1"
 serde = { features = ["derive"], optional = true, version = "1.0.130" }

pineappl_cli/Cargo.toml

@@ -30,5 +30,5 @@ crate-type = ["cdylib"]
 itertools = "0.10.1"
 ndarray = "0.15.4"
 numpy = "0.24.0"
-pineappl = { path = "../pineappl", version = "=1.0.0-alpha4" }
+pineappl = { path = "../pineappl", version = "=1.0.0-alpha5" }
 pyo3 = { features = ["extension-module"], version = "0.24.1" }

pineappl_py/Cargo.toml

@@ -2,10 +2,12 @@
 
 use super::convolutions::PyConv;
 use super::grid::PyGrid;
+use super::pids::PyPidBasis;
 use numpy::{IntoPyArray, PyArray1, PyArrayDyn};
 use pineappl::convolutions::ConvolutionCache;
 use pineappl::fk_table::{FkAssumptions, FkTable};
 use pineappl::grid::Grid;
+use pineappl::pids::PidBasis;
 use pyo3::prelude::*;
 use std::collections::BTreeMap;
 use std::fs::File;
@@ -206,6 +208,30 @@ impl PyFkTable {
         self.fk_table.x_grid().into_pyarray(py)
     }
 
+    /// Return the convention by which the channels' PIDS are encoded.
+    #[getter]
+    #[must_use]
+    pub const fn pid_basis(&self) -> PyPidBasis {
+        match self.fk_table.grid().pid_basis() {
+            PidBasis::Pdg => PyPidBasis::Pdg,
+            PidBasis::Evol => PyPidBasis::Evol,
+        }
+    }
+
+    /// Rotate the F Table into the specified basis.
+    ///
+    /// Parameters
+    /// ----------
+    /// pid_basis: PyPidBasis
+    ///     PID basis of the resulting FK Table
+    pub fn rotate_pid_basis(&mut self, pid_basis: PyPidBasis) -> PyGrid {
+        let mut grid_mut = self.fk_table.grid().clone();
+        grid_mut.rotate_pid_basis(pid_basis.into());
+        PyGrid {
+            grid: grid_mut.clone(),
+        }
+    }
+
     /// Write to file.
     ///
     /// # Panics

pineappl_py/src/fk_table.rs

@@ -696,7 +696,7 @@ impl PyGrid {
         self.grid.dedup_channels(ulps);
     }
 
-    /// Rotate the Grid into the specified basis
+    /// Rotate the Grid into the specified basis.
     ///
     /// Parameters
     /// ----------

pineappl_py/src/grid.rs

@@ -11,6 +11,7 @@
 from pineappl.convolutions import Conv, ConvType
 from pineappl.fk_table import FkAssumptions, FkTable
 from pineappl.subgrid import ImportSubgridV1
+from pineappl.pids import PidBasis
 
 
 class TestFkTable:
@@ -78,7 +79,7 @@ def test_fktable(
 
         assert fk.table().shape == (1, 51, 34, 34)
         np.testing.assert_allclose(fk.fac0(), 2.7224999999999997)
-        assert fk.frg0() == None
+        assert fk.frg0() is None
 
         # Check the various aspects of the Bins
         assert fk.bins() == 1
@@ -110,6 +111,11 @@ def test_fktable(
         assumption = FkAssumptions("Nf6Sym")
         fk.optimize(assumption)
 
+        # Check that FK table is in the Evolution basis and rotate into PDG
+        assert fk.pid_basis == PidBasis.Evol
+        new_fk = fk.rotate_pid_basis(PidBasis.Pdg)
+        assert new_fk.pid_basis == PidBasis.Pdg
+
     def test_unpolarized_convolution(
         self,
         pdf,

pineappl_py/tests/test_fk_table.py

@@ -21,4 +21,4 @@ clap_mangen = "0.2.26"
 enum_dispatch = "0.3.7"
 #git2 = "0.17.2"
 #semver = "1.0.17"
-pineappl_cli = { path = "../pineappl_cli", version = "=1.0.0-alpha4" }
+pineappl_cli = { path = "../pineappl_cli", version = "=1.0.0-alpha5" }