From da5b6cd42eede58627bb8e39c5996409db74795d Mon Sep 17 00:00:00 2001
From: Markus Seidel <markus.seidel@cern.ch>
Date: Thu, 3 Sep 2020 16:06:08 +0200
Subject: [PATCH] Revert "Revert "Update to Rivet 3.1.2 and Yoda 1.8.3""

This reverts commit 7e19969c7234af7b88d1cc27f949a74dec078463.
---
 fastjet-contrib.spec    |  4 ++--
 fastjet.spec            |  4 ++--
 rivet-weightnames.patch | 24 +++++++++++++-----------
 rivet.spec              |  2 +-
 yoda.spec               |  2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/fastjet-contrib.spec b/fastjet-contrib.spec
index 6b6962d50a3..cd6531f7a11 100644
--- a/fastjet-contrib.spec
+++ b/fastjet-contrib.spec
@@ -1,5 +1,5 @@
-### RPM external fastjet-contrib 1.033
-%define tag 69e835bfc3d36adfe70a1355a2773bc05d9f5599
+### RPM external fastjet-contrib 1.044
+%define tag 03f2fb3c7e26248f5cab3d6c52fab3e112342113
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&foo=1&output=/%{n}-%{realversion}.tgz
diff --git a/fastjet.spec b/fastjet.spec
index 7edee37faad..78457aa1056 100644
--- a/fastjet.spec
+++ b/fastjet.spec
@@ -1,7 +1,7 @@
-### RPM external fastjet 3.3.0
+### RPM external fastjet 3.3.4
 ## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 Requires: python
-%define tag acfff3bf99b6c754efe3768b81393935f3b9a05d
+%define tag f5af227227ed646d7cf41debe1b6fa0e35926416
 %define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%{github_user}/fastjet.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
diff --git a/rivet-weightnames.patch b/rivet-weightnames.patch
index 46b9f4c04a9..023d9fedd41 100644
--- a/rivet-weightnames.patch
+++ b/rivet-weightnames.patch
@@ -1,7 +1,8 @@
-diff -r 607da7b1c45b include/Rivet/AnalysisHandler.hh
---- a/include/Rivet/AnalysisHandler.hh	Thu Jul 18 15:56:06 2019 +0100
-+++ b/include/Rivet/AnalysisHandler.hh	Tue Jul 23 16:08:40 2019 +0200
-@@ -71,6 +71,8 @@
+diff --git a/include/Rivet/AnalysisHandler.hh b/include/Rivet/AnalysisHandler.hh
+index 38c93cb5e..0d9ca9d1d 100644
+--- a/include/Rivet/AnalysisHandler.hh
++++ b/include/Rivet/AnalysisHandler.hh
+@@ -76,6 +76,8 @@ namespace Rivet {
  
      /// Set the weight names from a GenEvent
      void setWeightNames(const GenEvent& ge);
@@ -9,8 +10,8 @@ diff -r 607da7b1c45b include/Rivet/AnalysisHandler.hh
 +    void setWeightNames(vector<string> weightNames) { _weightNames = weightNames; }
  
      /// Get the index of the nominal weight-stream
-     size_t defaultWeightIndex() const { return _defaultWeightIdx; }
-@@ -200,7 +202,7 @@
+     size_t defaultWeightIndex() const { return _rivetDefaultWeightIdx; }
+@@ -227,7 +229,7 @@ namespace Rivet {
      //@{
  
      /// Initialize a run, with the run beams taken from the example event.
@@ -19,10 +20,11 @@ diff -r 607da7b1c45b include/Rivet/AnalysisHandler.hh
  
      /// @brief Analyze the given \a event by reference.
      ///
-diff -r 607da7b1c45b src/Core/AnalysisHandler.cc
---- a/src/Core/AnalysisHandler.cc	Thu Jul 18 15:56:06 2019 +0100
-+++ b/src/Core/AnalysisHandler.cc	Tue Jul 23 16:08:40 2019 +0200
-@@ -62,7 +62,7 @@
+diff --git a/src/Core/AnalysisHandler.cc b/src/Core/AnalysisHandler.cc
+index cc0fa0ddb..a34c20023 100644
+--- a/src/Core/AnalysisHandler.cc
++++ b/src/Core/AnalysisHandler.cc
+@@ -69,7 +69,7 @@ namespace Rivet {
    }
  
  
@@ -31,7 +33,7 @@ diff -r 607da7b1c45b src/Core/AnalysisHandler.cc
      if (_initialised)
        throw UserError("AnalysisHandler::init has already been called: cannot re-initialize!");
  
-@@ -72,7 +72,12 @@
+@@ -79,7 +79,12 @@ namespace Rivet {
      MSG_DEBUG("Initialising the analysis handler");
      _eventNumber = ge.event_number();
  
diff --git a/rivet.spec b/rivet.spec
index d1319c39390..65afa356ab1 100644
--- a/rivet.spec
+++ b/rivet.spec
@@ -1,4 +1,4 @@
-### RPM external rivet 3.1.0
+### RPM external rivet 3.1.2
 ## INITENV +PATH PYTHON27PATH %{i}/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHON3PATH %{i}/${PYTHON3_LIB_SITE_PACKAGES}
 ## OLD GENSER Source: http://cern.ch/service-spi/external/MCGenerators/distribution/rivet/rivet-%{realversion}-src.tgz
diff --git a/yoda.spec b/yoda.spec
index 836d878df31..23c239885c0 100644
--- a/yoda.spec
+++ b/yoda.spec
@@ -1,4 +1,4 @@
-### RPM external yoda 1.8.0
+### RPM external yoda 1.8.3
 ## INITENV +PATH PYTHON27PATH %i/${PYTHON_LIB_SITE_PACKAGES}
 ## INITENV +PATH PYTHON3PATH %i/${PYTHON3_LIB_SITE_PACKAGES}