Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rivet 3.1.10 and Yoda 1.9.10 #9006

Merged
merged 4 commits into from
Feb 29, 2024
Merged

Rivet 3.1.10 and Yoda 1.9.10 #9006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86a772b
Rivet 3.1.10 and Yoda 1.9.10
mseidel42 Feb 12, 2024
92cf63b
Revert "Fix deprecated warnings for yoda"
mseidel42 Feb 13, 2024
6e7721c
Revert "Fix deprecated warnings for rivet"
mseidel42 Feb 13, 2024
17b10ee
Patching include in ATLAS_2023_I2663725
mseidel42 Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions rivet-analysis.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

38 changes: 0 additions & 38 deletions rivet-deprecated-warn.patch
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions rivet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
16 changes: 0 additions & 16 deletions yoda-deprecated-warn.patch
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions yoda.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down