Remove ambiguous methods from FkTable and keep only rotate_pid_basis

Author: Radonirinaunimi

pineappl/src/fk_table.rs

@@ -3,7 +3,7 @@
 use super::boc::{Channel, Kinematics, Order};
 use super::convolutions::ConvolutionCache;
 use super::error::{Error, Result};
-use super::grid::Grid;
+use super::grid::{Grid, GridOptFlags};
 use super::pids::{OptRules, PidBasis};
 use super::subgrid::{self, EmptySubgridV1, Subgrid};
 use ndarray::{s, ArrayD};
@@ -252,16 +252,9 @@ impl FkTable {
     /// Rotate the FK Table into the specified basis.
     pub fn rotate_pid_basis(&mut self, pid_basis: PidBasis) {
         self.grid.rotate_pid_basis(pid_basis);
-    }
-
-    /// Merges the factors of the channels into the subgrids to normalize channel coefficients.
-    pub fn merge_channel_factors(&mut self) {
-        self.grid.merge_channel_factors();
-    }
-
-    /// Splits the grid such that each channel contains only a single tuple of PIDs.
-    pub fn split_channels(&mut self) {
         self.grid.split_channels();
+        self.grid.merge_channel_factors();
+        self.grid.optimize_using(GridOptFlags::all());
     }
 
     /// Optimize the size of this FK-table by throwing away heavy quark flavors assumed to be zero

pineappl_py/src/fk_table.rs

@@ -244,16 +244,6 @@ impl PyFkTable {
         self.fk_table.rotate_pid_basis(pid_basis.into());
     }
 
-    /// Merge the factors of all the channels.
-    pub fn merge_channel_factors(&mut self) {
-        self.fk_table.merge_channel_factors();
-    }
-
-    /// Splits the grid such that each channel contains only a single tuple of PIDs.
-    pub fn split_channels(&mut self) {
-        self.fk_table.split_channels();
-    }
-
     /// Write to file.
     ///
     /// # Panics

pineappl_py/tests/test_fk_table.py

@@ -5,7 +5,6 @@
 """
 
 import numpy as np
-import pytest
 import tempfile
 
 from pineappl.boc import Channel, Order
@@ -129,20 +128,11 @@ def test_fktable_rotations(
         fk_evol_facs = fk.channels_factors()
         np.testing.assert_array_equal(fk_evol_facs, 1)
 
-        # rotate in the PDG basis and check that some factors are not `1`
+        # rotate in the PDG basis and check that all the factors are unity
         fk.rotate_pid_basis(PidBasis.Pdg)
         assert fk.pid_basis == PidBasis.Pdg
         fk_pdg_facs = fk.channels_factors()
-        with pytest.raises(expected_exception=AssertionError):
-            np.testing.assert_array_equal(fk_pdg_facs, 1)
-
-        # merge the factors and check that they are back to unity
-        fk.split_channels()
-        fk.merge_channel_factors()
-        # optimize the FK table to remove duplicate channels
-        fk.optimize(FkAssumptions("Nf6Ind"))
-        fk_facs = fk.channels_factors()
-        np.testing.assert_array_equal(fk_facs, 1)
+        np.testing.assert_array_equal(fk_pdg_facs, 1)
 
         # check that the FK table can be loaded properly
         with tempfile.TemporaryDirectory() as tmpdir: