Merge branch 'master' into capi-set-subgrid

Author: rabemananjara-l

CHANGELOG.md

@@ -7,6 +7,52 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- added a `fix_convolution` method to integrate out one of the convolution
+  dimensions in a grid by convolving it with a non-perturbative function
+
+## [1.3.0] - 06/12/2025
+
+### Added
+
+- added a `pineappl_grid_delete_bins` method to the C-API
+
+### Fixed
+
+- fixed bugs in stopping condition of the Newton iteration method
+- fixed a bug in comparing `interpolation::Interp` objects when one of the
+  boundaries is `NaN`
+
+## [1.2.0] - 22/08/2025
+
+### Added
+
+- added `Grid::repair` to repair bugs that survived by writing bugged grids to
+  disk, for example <https://github.com/NNPDF/pineappl/issues/338>. The CLI
+  offers this functionality via `pineappl write --repair` and it can also be
+  accessed via Python
+
+### Fixed
+
+- added a missing implementation for a branch in `Grid::merge` that was
+  triggered when exporting some PineAPPL grids generated from the 'pinejet'
+  group
+- fixed wrong coupling orders when exporting to APPLgrid. This happened when
+  the PineAPPL grid had orders that had any other ordering than 'LO', 'NLO',
+  'NNLO'
+- fixed a bug that caused exported grids to compare unsuccessfully when the
+  convolution functions were proton-anti-proton; APPLgrid doesn't store the
+  types of convolution functions, so we simply convert the grid to use only
+  proton PDFs
+
+### Changed
+
+- the function `Grid::evolve` now makes use of parallelization to take advantage
+  of the number of CPU cores available using the Rayon crate; the number of CPU
+  cores to be used can be controlled via the `RAYON_NUM_THREADS` environment
+  variable
+
 ## [1.1.0] - 08/07/2025
 
 ### Added
@@ -782,7 +828,9 @@ the old file format can still be read with this new version.
 
 - first release
 
-[Unreleased]: https://github.com/NNPDF/pineappl/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/NNPDF/pineappl/compare/v1.3.0...HEAD
+[1.3.0]: https://github.com/NNPDF/pineappl/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/NNPDF/pineappl/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/NNPDF/pineappl/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/NNPDF/pineappl/compare/v0.8.2...v1.0.0
 [0.8.7]: https://github.com/NNPDF/pineappl/compare/v0.8.6...v0.8.7

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.1.0"
+version = "1.3.0"
 
 [workspace.lints.clippy]
 all = { level = "warn", priority = -1 }

Cargo.toml

@@ -23,7 +23,8 @@ PROGRAMS = \
 	display-orders \
 	display-orders-deprecated \
 	merge-grids \
-	modify-grid
+	modify-grid \
+	fix-convolution
 
 all: $(PROGRAMS)
 
@@ -48,6 +49,9 @@ convolve-grid-deprecated: convolve-grid-deprecated.cpp
 convolve-grid: convolve-grid.cpp
 	$(CXX) $(CXXFLAGS) $< $(LHAPDF_DEPS) $(PINEAPPL_DEPS) -o $@
 
+fix-convolution: fix-convolution.cpp
+	$(CXX) $(CXXFLAGS) $< $(LHAPDF_DEPS) $(PINEAPPL_DEPS) -o $@
+
 deprecated: deprecated.cpp
 	$(CXX) $(CXXFLAGS) $< $(LHAPDF_DEPS) $(PINEAPPL_DEPS) -o $@
 

examples/cpp/Makefile

@@ -173,6 +173,37 @@ int main() {
 
     pineappl_grid_write(grid, "advanced-filling.pineappl.lz4");
 
+    //-----------------------------------------------------------------------//
+    
+    // Remove the bins for which the convolution is zero.
+    std::vector<uintptr_t> zero_indices;
+    zero_indices.reserve(dxsec.size());
+    for (size_t i = 0; i < dxsec.size(); ++i) {
+        if (dxsec[i] == 0.0) {
+           zero_indices.push_back(static_cast<uintptr_t>(i));
+        }
+    }
+    pineappl_grid_delete_bins(grid, zero_indices.data(), zero_indices.size());
+
+    std::vector<double> dxsec_no_zeros(pineappl_grid_bin_count(grid));
+    pineappl_grid_convolve(grid, xfx, alphas, pdf_states, pdf.get(), order_mask, channel_mask,
+        nullptr, 1, mmu_scales.data(), dxsec_no_zeros.data());
+
+    // Print table header
+    std::cout << " " << std::endl;
+    std::cout << std::setw(10) << "bin left"
+              << std::setw(12) << "bin right"
+              << std::setw(15) << "dsig/dx" << std::endl;
+    std::cout << std::string(37, '-') << std::endl;
+
+    // Loop through bins and print results
+    for (size_t i = 0; i < dxsec_no_zeros.size(); ++i) {
+        std::cout << std::setw(10) << bins[i]
+                  << std::setw(12) << bins[i + 1]
+                  << std::setw(15) << std::scientific << std::setprecision(3) << dxsec_no_zeros[i]
+                  << std::endl;
+    }
+
     // release memory
     pineappl_grid_delete(grid);
 }

examples/cpp/advanced-filling.cpp

@@ -24,3 +24,7 @@
  2.100e+00   2.200e+00      0.000e+00
  2.200e+00   2.300e+00      0.000e+00
  2.300e+00   2.400e+00      0.000e+00
+ 
+  bin left   bin right        dsig/dx
+-------------------------------------
+ 0.000e+00   1.000e-01      6.683e+03