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

Revert "Revert "Update to Rivet 3.1.2 and Yoda 1.8.3"" #6209

Merged
merged 1 commit into from
Sep 7, 2020
Merged

Revert "Revert "Update to Rivet 3.1.2 and Yoda 1.8.3"" #6209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions fastjet-contrib.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions fastjet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
24 changes: 13 additions & 11 deletions rivet-weightnames.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
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);
+ /// Set the weight names from vector<string>
+ 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.
Expand All @@ -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 {
}


Expand All @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion rivet.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion yoda.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}

Expand Down