Accommodate for two different EKOs in Evolution

.github/workflows/capi.yaml

@@ -6,6 +6,11 @@ on:
       - pycli
       - bump-pyo3-version
 
+env:
+  # our GLIBC version is too old to support Node 20:
+  # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
 jobs:
   capi:
     runs-on: ubuntu-latest

.github/workflows/msrv.yml

@@ -8,6 +8,9 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  # our GLIBC version is too old to support Node 20:
+  # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   build:

.github/workflows/release.yml

@@ -9,6 +9,9 @@ on:
 env:
   # this is make the `gh` binary work
   GH_TOKEN: ${{ github.token }}
+  # our GLIBC version is too old to support Node 20:
+  # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   # create a release on github

.github/workflows/rust.yml

@@ -12,6 +12,9 @@ defaults:
 
 env:
   CARGO_TERM_COLOR: always
+  # our GLIBC version is too old to support Node 20:
+  # https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
   build:
@@ -25,7 +28,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: test-data
-          key: test-data-v11
+          key: test-data-v12
       - name: Download test data
         if: steps.cache-test-data.outputs.cache-hit != 'true'
         run: |
@@ -55,6 +58,9 @@ jobs:
           curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-h1-dijets-appl-arxiv-0010054/grids/applfast-h1-dijets-appl-arxiv-0010054-xsec000.appl'
           curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-h1-incjets-fnlo-arxiv-0706.3722/grids/applfast-h1-incjets-fnlo-arxiv-0706.3722-xsec000.tab.gz'
           curl -s -C - -O 'https://ploughshare.web.cern.ch/ploughshare/db/atlas/atlas-atlas-wpm-arxiv-1109.5141/grids/atlas-atlas-wpm-arxiv-1109.5141-xsec001.appl'
+          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL.pineappl.lz4'
+          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL_PolPDF.tar'
+          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL_UnpolPDF.tar'
 
       - name: Set RUSTDOCFLAGS
         run: |

maintainer/generate-coverage.sh

@@ -27,6 +27,9 @@ wget --no-verbose --no-clobber -P test-data 'https://ploughshare.web.cern.ch/plo
 wget --no-verbose --no-clobber -P test-data 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-h1-dijets-appl-arxiv-0010054/grids/applfast-h1-dijets-appl-arxiv-0010054-xsec000.appl'
 wget --no-verbose --no-clobber -P test-data 'https://ploughshare.web.cern.ch/ploughshare/db/applfast/applfast-h1-incjets-fnlo-arxiv-0706.3722/grids/applfast-h1-incjets-fnlo-arxiv-0706.3722-xsec000.tab.gz'
 wget --no-verbose --no-clobber -P test-data 'https://ploughshare.web.cern.ch/ploughshare/db/atlas/atlas-atlas-wpm-arxiv-1109.5141/grids/atlas-atlas-wpm-arxiv-1109.5141-xsec001.appl'
+wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL.pineappl.lz4'
+wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL_PolPDF.tar'
+wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/STAR_WMWP_510GEV_WM-AL-POL_UnpolPDF.tar'
 
 # we compile with different flags and don't want to destroy the other target directory
 export CARGO_TARGET_DIR="$(mktemp -d)"

maintainer/pineappl-ci/script.sh

@@ -42,7 +42,7 @@ ldconfig
 cd ..
 
 # install PDF sets
-for pdf in NNPDF31_nlo_as_0118_luxqed NNPDF40_nnlo_as_01180 NNPDF40_nlo_as_01180; do
+for pdf in NNPDF31_nlo_as_0118_luxqed NNPDF40_nnlo_as_01180 NNPDF40_nlo_as_01180 NNPDF40_nlo_pch_as_01180; do
     curl "https://lhapdfsets.web.cern.ch/current/${pdf}.tar.gz" | tar xzf - -C /usr/local/share/LHAPDF
 done
 

pineappl/src/evolution.rs

@@ -633,3 +633,122 @@ pub(crate) fn evolve_slice_with_two(
             .collect(),
     ))
 }
+
+pub(crate) fn evolve_slice_with_two2(
+    grid: &Grid,
+    input_operator_a: &ArrayView4<f64>,
+    input_operator_b: &ArrayView4<f64>,
+    info_a: &OperatorSliceInfo,
+    info_b: &OperatorSliceInfo,
+    order_mask: &[bool],
+    xi: (f64, f64),
+    alphas_table: &AlphasTable,
+) -> Result<(Array3<SubgridEnum>, Vec<Channel>), GridError> {
+    let gluon_has_pid_zero = gluon_has_pid_zero(grid);
+
+    let (pid_indices_a, pids_a) =
+        pid_slices(input_operator_a, info_a, gluon_has_pid_zero, &|pid1| {
+            grid.channels()
+                .iter()
+                .flat_map(Channel::entry)
+                .any(|&(a, _, _)| a == pid1)
+        })?;
+    let (pid_indices_b, pids_b) =
+        pid_slices(input_operator_b, info_b, gluon_has_pid_zero, &|pid1| {
+            grid.channels()
+                .iter()
+                .flat_map(Channel::entry)
+                .any(|&(_, b, _)| b == pid1)
+        })?;
+
+    let channels0 = channels0_with_two(&pids_a, &pids_b);
+    let mut sub_fk_tables = Vec::with_capacity(grid.bin_info().bins() * channels0.len());
+
+    let mut last_x1a = Vec::new();
+    let mut last_x1b = Vec::new();
+    let mut operators_a = Vec::new();
+    let mut operators_b = Vec::new();
+
+    for subgrids_ol in grid.subgrids().axis_iter(Axis(1)) {
+        // NOTE: `info_a.x0.len()` and `info_b.x0.len()` are the same
+        let mut tables = vec![Array2::zeros((info_a.x0.len(), info_a.x0.len())); channels0.len()];
+
+        for (subgrids_o, channel1) in subgrids_ol.axis_iter(Axis(1)).zip(grid.channels()) {
+            let (x1_a, x1_b, array) = ndarray_from_subgrid_orders_slice(
+                info_a,
+                &subgrids_o,
+                grid.orders(),
+                order_mask,
+                xi,
+                alphas_table,
+            )?;
+
+            if (last_x1a.len() != x1_a.len())
+                || last_x1a
+                    .iter()
+                    .zip(x1_a.iter())
+                    .any(|(&lhs, &rhs)| !approx_eq!(f64, lhs, rhs, ulps = EVOLUTION_TOL_ULPS))
+            {
+                operators_a = operator_slices(input_operator_a, info_a, &pid_indices_a, &x1_a)?;
+                last_x1a = x1_a;
+            }
+
+            if (last_x1b.len() != x1_b.len())
+                || last_x1b
+                    .iter()
+                    .zip(x1_b.iter())
+                    .any(|(&lhs, &rhs)| !approx_eq!(f64, lhs, rhs, ulps = EVOLUTION_TOL_ULPS))
+            {
+                operators_b = operator_slices(input_operator_b, info_b, &pid_indices_b, &x1_b)?;
+                last_x1b = x1_b;
+            }
+
+            let mut tmp = Array2::zeros((last_x1a.len(), info_a.x0.len()));
+
+            for &(pida1, pidb1, factor) in channel1.entry() {
+                for (fk_table, opa, opb) in channels0.iter().zip(tables.iter_mut()).filter_map(
+                    |(&(pida0, pidb0), fk_table)| {
+                        pids_a
+                            .iter()
+                            .zip(operators_a.iter())
+                            .find_map(|(&(pa0, pa1), opa)| {
+                                (pa0 == pida0 && pa1 == pida1).then_some(opa)
+                            })
+                            .zip(pids_b.iter().zip(operators_b.iter()).find_map(
+                                |(&(pb0, pb1), opb)| (pb0 == pidb0 && pb1 == pidb1).then_some(opb),
+                            ))
+                            .map(|(opa, opb)| (fk_table, opa, opb))
+                    },
+                ) {
+                    linalg::general_mat_mul(1.0, &array, &opb.t(), 0.0, &mut tmp);
+                    linalg::general_mat_mul(factor, opa, &tmp, 1.0, fk_table);
+                }
+            }
+        }
+
+        sub_fk_tables.extend(tables.into_iter().map(|table| {
+            ImportOnlySubgridV2::new(
+                SparseArray3::from_ndarray(table.insert_axis(Axis(0)).view(), 0, 1),
+                vec![Mu2 {
+                    // TODO: FK tables don't depend on the renormalization scale
+                    //ren: -1.0,
+                    ren: info_a.fac0,
+                    fac: info_a.fac0,
+                }],
+                info_a.x0.clone(),
+                info_a.x0.clone(),
+            )
+            .into()
+        }));
+    }
+
+    Ok((
+        Array1::from_iter(sub_fk_tables)
+            .into_shape((1, grid.bin_info().bins(), channels0.len()))
+            .unwrap(),
+        channels0
+            .iter()
+            .map(|&(a, b)| channel![a, b, 1.0])
+            .collect(),
+    ))
+}