diff --git a/rivet-analysis.patch b/rivet-analysis.patch new file mode 100644 index 00000000000..b1302b1cf0d --- /dev/null +++ b/rivet-analysis.patch @@ -0,0 +1,12 @@ +diff --git a/analyses/pluginATLAS/ATLAS_2023_I2663725.cc b/analyses/pluginATLAS/ATLAS_2023_I2663725.cc +index 41d39daad7645a563654a55f423ebe4a71a23ef1..e0c1e538ce9d4ddd793ed202db53d7294d3b8144 100644 +--- a/analyses/pluginATLAS/ATLAS_2023_I2663725.cc ++++ b/analyses/pluginATLAS/ATLAS_2023_I2663725.cc +@@ -5,6 +5,7 @@ + #include "Rivet/Projections/DressedLeptons.hh" + #include "Rivet/Projections/PromptFinalState.hh" + #include "Rivet/Projections/InvisibleFinalState.hh" ++#include "Rivet/Projections/VetoedFinalState.hh" + + namespace Rivet { + diff --git a/rivet-deprecated-warn.patch b/rivet-deprecated-warn.patch deleted file mode 100644 index bb7a58dc2a7..00000000000 --- a/rivet-deprecated-warn.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -Naur /include/Rivet/Math/MatrixN.hh b/include/Rivet/Math/MatrixN.hh ---- a/include/Rivet/Math/MatrixN.hh 2023-12-03 01:21:00.000000000 +0100 -+++ b/include/Rivet/Math/MatrixN.hh 2023-12-04 12:13:12.539590815 +0100 -@@ -66,8 +66,6 @@ - - Matrix() : _matrix(EMatrix::Zero()) {} - -- Matrix(const Matrix& other) : _matrix(other._matrix) {} -- - Matrix& set(const size_t i, const size_t j, const double value) { - if (i < N && j < N) { - _matrix(i, j) = value; -diff -Naur a/include/Rivet/Math/VectorN.hh b/include/Rivet/Math/VectorN.hh ---- a/include/Rivet/Math/VectorN.hh 2023-12-03 01:21:00.000000000 +0100 -+++ b/include/Rivet/Math/VectorN.hh 2023-12-04 12:13:22.652275368 +0100 -@@ -27,9 +27,6 @@ - public: - Vector() : _vec(EVector::Zero()) { } - -- Vector(const Vector& other) -- : _vec(other._vec) { } -- - const double& get(const size_t index) const { - if (index >= N) { - throw std::runtime_error("Tried to access an invalid vector index."); -diff -Naur a/include/Rivet/Projection.hh b/include/Rivet/Projection.hh ---- a/include/Rivet/Projection.hh 2023-12-03 01:21:00.000000000 +0100 -+++ b/include/Rivet/Projection.hh 2023-12-04 12:03:13.447281503 +0100 -@@ -43,6 +43,9 @@ - /// The default constructor. - Projection(); - -+ /// Copy constructor -+ Projection(const Projection&) = default; -+ - /// Clone on the heap. - virtual unique_ptr clone() const = 0; - diff --git a/rivet.spec b/rivet.spec index 4eba253f7d1..7a18cbdf81c 100644 --- a/rivet.spec +++ b/rivet.spec @@ -1,13 +1,15 @@ -### RPM external rivet 3.1.8 +### RPM external rivet 3.1.10 ## INCLUDE cpp-standard ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES} ## OLD GENSER Source: http://cern.ch/service-spi/external/MCGenerators/distribution/rivet/rivet-%{realversion}-src.tgz Source: git+https://gitlab.com/hepcedar/rivet.git?obj=master/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz -Patch0: rivet-deprecated-warn +Patch0: rivet-analysis + Requires: hepmc fastjet fastjet-contrib yoda BuildRequires: python3 py3-cython autotools %prep +## OLD GENSER: %setup -n rivet/%{realversion} %setup -n %{n}-%{realversion} %patch0 -p1 diff --git a/yoda-deprecated-warn.patch b/yoda-deprecated-warn.patch deleted file mode 100644 index ddce71766c7..00000000000 --- a/yoda-deprecated-warn.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur a/include/YODA/Utils/BinSearcher.h b/include/YODA/Utils/BinSearcher.h ---- a/include/YODA/Utils/BinSearcher.h 2023-12-03 01:04:33.000000000 +0100 -+++ b/include/YODA/Utils/BinSearcher.h 2023-12-04 12:04:02.243759129 +0100 -@@ -145,12 +145,6 @@ - _est = std::make_shared(0, 0, 1); - } - -- /// Copy constructor -- BinSearcher(const BinSearcher& bs) { -- _est = bs._est; -- _edges = bs._edges; -- } -- - // /// Explicit constructor, specifying the edges and estimation strategy - // BinSearcher(const std::vector& edges, bool log) { - // _updateEdges(edges); diff --git a/yoda.spec b/yoda.spec index b4896b3c60e..b9835ef0d1c 100644 --- a/yoda.spec +++ b/yoda.spec @@ -1,14 +1,13 @@ -### RPM external yoda 1.9.8 +### RPM external yoda 1.9.10 ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES} Source: git+https://gitlab.com/hepcedar/yoda.git?obj=main/%{n}-%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz -Patch0: yoda-deprecated-warn + Requires: python3 root BuildRequires: py3-cython autotools python-python3 %prep %setup -q -n %{n}-%{realversion} -%patch0 -p1 autoreconf -fiv