From 2aef6b2d5520f42ea21d65ebe52eb57e49672cf1 Mon Sep 17 00:00:00 2001
From: Dmitri Konstantinov <Dmitri.Konstantinov@cern.ch>
Date: Wed, 11 Dec 2024 14:19:45 +0100
Subject: [PATCH] Backport patches for rivet-3.1.10 and lhapdf-6.2.3p1 to
LCG_105 for LHCb
---
generators/patches/lhapdf-6.2.3p1.patch | 22 ++++++++++++++++++++++
generators/patches/rivet-3.1.10.patch | 10 ++++++++++
2 files changed, 32 insertions(+)
create mode 100644 generators/patches/lhapdf-6.2.3p1.patch
create mode 100644 generators/patches/rivet-3.1.10.patch
diff --git a/generators/patches/lhapdf-6.2.3p1.patch b/generators/patches/lhapdf-6.2.3p1.patch
new file mode 100644
index 0000000000..92b9936157
--- /dev/null
+++ b/generators/patches/lhapdf-6.2.3p1.patch
@@ -0,0 +1,22 @@
+--- bin/lhapdf.orig 2019-06-19 12:46:07.190871488 +0200
++++ bin/lhapdf 2019-06-19 12:46:12.070897902 +0200
+@@ -287,7 +287,7 @@
+ (by default lists all sets available for download; use --installed or --outdated to explore those installed on the current system)"""
+ ap = argparse.ArgumentParser(description=__doc__, usage="%(prog)s list [options] [pattern...]")
+ ap.add_argument("PATTERNS", nargs="*", help="patterns to match PDF sets against")
+- ag = ap.add_add_mutually_exclusive_group()
++ ag = ap.add_mutually_exclusive_group()
+ ag.add_argument("--installed", dest="INSTALLED", action="store_true", help="list installed PDF sets")
+ ag.add_argument("--outdated", dest="OUTDATED", action="store_true", help="list installed, but outdated, PDF sets")
+ ap.add_argument("--codes", dest="CODES", action="store_true", help="additionally show ID codes")
+--- wrappers/python/lhapdf.pyx~ 2017-08-28 14:14:14.000000000 +0200
++++ wrappers/python/lhapdf.pyx 2024-06-17 15:14:30.640245983 +0200
+@@ -525 +525 @@
+- print "You can only set the flavor scheme to FIXED or VARIABLE"
++ print("You can only set the flavor scheme to FIXED or VARIABLE")
+@@ -531 +531 @@
+- print "FIXED"
++ print("FIXED")
+@@ -533 +533 @@
+- print "VARIABLE"
++ print("VARIABLE")
diff --git a/generators/patches/rivet-3.1.10.patch b/generators/patches/rivet-3.1.10.patch
new file mode 100644
index 0000000000..c2306facf0
--- /dev/null
+++ b/generators/patches/rivet-3.1.10.patch
@@ -0,0 +1,10 @@
+--- analyses/pluginATLAS/ATLAS_2023_I2663725.cc.orig 2024-02-16 15:51:04.947343208 +0100
++++ analyses/pluginATLAS/ATLAS_2023_I2663725.cc 2024-02-16 15:51:35.932316347 +0100
+@@ -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 {
+
--
GitLab