Nuke v0 in OOP C++

NNPDF · Feb 7, 2025 · 7f7184a · 7f7184a
1 parent 8db10ab
commit 7f7184a
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 481 deletions.
diff --git a/examples/object-oriented-cpp/Makefile b/examples/object-oriented-cpp/Makefile
@@ -4,7 +4,6 @@ PINEAPPL_DEPS != pkg-config --cflags --libs pineappl_capi
 LHAPDF_DEPS != pkg-config --cflags --libs lhapdf
 
 PROGRAMS = \
-	dyaa-deprecated \
 	dyaa \
 
 all: $(PROGRAMS)
@@ -15,9 +14,6 @@ test-examples: $(PROGRAMS)
 dyaa: dyaa.cpp
 	$(CXX) $(CXXFLAGS) $< $(PINEAPPL_DEPS) $(LHAPDF_DEPS) -o $@
 
-dyaa-deprecated: dyaa-deprecated.cpp
-	$(CXX) $(CXXFLAGS) $< $(PINEAPPL_DEPS) $(LHAPDF_DEPS) -o $@
-
 PHONY: clean
 
 clean:

diff --git a/examples/object-oriented-cpp/dyaa-deprecated.cpp b/examples/object-oriented-cpp/dyaa-deprecated.cpp
diff --git a/examples/object-oriented-cpp/dyaa.cpp b/examples/object-oriented-cpp/dyaa.cpp
@@ -58,7 +58,7 @@ Psp2to2 hadronic_pspgen(std::mt19937& rng, double mmin, double mmax) {
   return {s, t, u, x1, x2, jacobian};
 }
 
-void fill_grid(PineAPPL::GridV1& grid, std::size_t calls) {
+void fill_grid(PineAPPL::Grid& grid, std::size_t calls) {
   using std::acosh;
   using std::fabs;
   using std::log;
@@ -114,7 +114,7 @@ int main() {
   // --- Instatiate the Order object
   // only LO $\alpha_\mathrm{s}^0 \alpha^2 \log^0(\xi_\mathrm{R})
   // \log^0(\xi_\mathrm{F}) \log^0(\xi_\mathrm{A})$
-  std::vector<PineAPPL::OrderV1> orders = {PineAPPL::OrderV1{0, 2, 0, 0, 0}};
+  std::vector<PineAPPL::Order> orders = {PineAPPL::Order{0, 2, 0, 0, 0}};
 
   // --- Define the binning
   // we bin in rapidity from 0 to 2.4 in steps of 0.1
@@ -155,7 +155,7 @@ int main() {
   // Define the μ scale
   std::vector<std::size_t> mu_scales = {1, 1, 1};
 
-  PineAPPL::GridV1 grid(orders, channels, pid_basis, pids, convolution_types,
+  PineAPPL::Grid grid(orders, channels, pid_basis, pids, convolution_types,
                         kinematics, interpolations, bins, mu_scales);
 
   // fill the grid with phase-space points

diff --git a/examples/object-oriented-cpp/output b/examples/object-oriented-cpp/output
@@ -1,34 +1,3 @@
-00 0.0 0.1 5.263e-01
-01 0.1 0.2 5.255e-01
-02 0.2 0.3 5.247e-01
-03 0.3 0.4 5.188e-01
-04 0.4 0.5 5.175e-01
-05 0.5 0.6 5.009e-01
-06 0.6 0.7 4.905e-01
-07 0.7 0.8 4.676e-01
-08 0.8 0.9 4.393e-01
-09 0.9 1.0 3.993e-01
-10 1.0 1.1 3.707e-01
-11 1.1 1.2 3.265e-01
-12 1.2 1.3 2.849e-01
-13 1.3 1.4 2.487e-01
-14 1.4 1.5 2.110e-01
-15 1.5 1.6 1.797e-01
-16 1.6 1.7 1.471e-01
-17 1.7 1.8 1.206e-01
-18 1.8 1.9 9.492e-02
-19 1.9 2.0 7.256e-02
-20 2.0 2.1 5.057e-02
-21 2.1 2.2 3.492e-02
-22 2.2 2.3 1.968e-02
-23 2.3 2.4 5.565e-03
-Finished running 10000000 events.
-Generated DY-LO-AA-deprecated.pineappl.lz4 containing a a -> l+ l-.
-
-Try running (PDF sets must contain non-zero photon PDF):
-  - pineappl convolve DY-LO-AA-deprecated.pineappl.lz4 NNPDF31_nnlo_as_0118_luxqed
-  - pineappl --silence-lhapdf plot DY-LO-AA-deprecated.pineappl.lz4 NNPDF31_nnlo_as_0118_luxqed MSHT20qed_nnlo > plot_script.py
-  - pineappl --help
 Generated DY-LO-AA.pineappl.lz4 containing a a -> l+ l-.
 
 Try running (PDF sets must contain non-zero photon PDF):