Hello community, here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2019-08-27 10:21:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Rivet (Old) and /work/SRC/openSUSE:Factory/.Rivet.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet" Tue Aug 27 10:21:27 2019 rev:15 rq:725955 version:2.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2018-06-29 22:30:04.902316045 +0200 +++ /work/SRC/openSUSE:Factory/.Rivet.new.7948/Rivet.changes 2019-08-27 10:22:13.443936219 +0200 @@ -1,0 +2,22 @@ +Wed Aug 21 08:37:52 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Update to version 2.7.2 + * Fixes to CMS_2016_I1487288 jet selection and normalisation. + * Improve Vector3::azimuthalAngle() (also used by FourMomentum + and FourVector) to use exact rather than fuzzy is-zero check, + to only check the perpendicular components, and to note that + IEEE floating point implementations of atan2 should already be + 'safe' unless we decide that this function should throw or + return NaN in case of null or along-z vectors. + * Tools/Utils.h: Add isum() functions, and mark other container + functions as wanting a conversion to use std::function. + * Add super-generic (i)discardIfAny(particlebases, + particlebases, bool(pb,pb)) functions. + * Introduce TTMODE options for MC_TTBAR to pick the decay mode +- Changes from versions 2.7.1 and 2.7.0: See + %{_docdir}/%{name}-devel/ChangeLog. +- Add Rivet-fix-ambiguous-namespace.patch: Fixed Et -> Kin::Et to + avoid ambiguous namespace; patch taken from upstream commit +- YODA >= 1.7.4 required for building. + +------------------------------------------------------------------- Old: ---- Rivet-2.6.0.tar.bz2 New: ---- Rivet-2.7.2.tar.bz2 Rivet-fix-ambiguous-namespace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Rivet.spec ++++++ --- /var/tmp/diff_new_pack.YdhuVq/_old 2019-08-27 10:22:16.599936009 +0200 +++ /var/tmp/diff_new_pack.YdhuVq/_new 2019-08-27 10:22:16.599936009 +0200 @@ -1,7 +1,7 @@ # # spec file for package Rivet # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define so_name lib%{name}-2_6_0 +%define so_name lib%{name}-2_7_2 Name: Rivet -Version: 2.6.0 +Version: 2.7.2 Release: 0 Summary: A toolkit for validation of Monte Carlo event generators License: GPL-2.0-only @@ -26,8 +26,10 @@ URL: http://rivet.hepforge.org/ Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2 Patch0: sover.diff +# PATCH-FIX-UPSTREAM Rivet-fix-ambiguous-namespace.patch [email protected] -- Fixed Et -> Kin::Et to avoid ambiguous namespace; patch taken from upstream commit +Patch1: Rivet-fix-ambiguous-namespace.patch BuildRequires: HepMC2-devel -BuildRequires: YODA-devel >= 1.0.6 +BuildRequires: YODA-devel >= 1.7.4 BuildRequires: doxygen BuildRequires: fastjet-devel BuildRequires: fastjet-plugin-siscone-devel @@ -125,6 +127,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # REMOVE EXISTING rivet.pc FILE, ALLOW make TO GENERATE rivet.pc FROM rivet.pc.in rm -f rivet.pc @@ -160,6 +163,11 @@ echo "%{_libdir}/%{name}-plugins" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-plugins.conf # /SECTION +chmod -x %{buildroot}%{_datadir}/Rivet/ALICE_2012_I1126966.info %{buildroot}%{_datadir}/Rivet/ALICE_2014_I1243865.info +sed -E -i '1{/^#!.*env python/d}' %{buildroot}%{python_sitearch}/rivet/spiresbib.py + +%fdupes %{buildroot}%{_datadir}/Rivet/ + %post -n %{so_name} -p /sbin/ldconfig %postun -n %{so_name} -p /sbin/ldconfig ++++++ Rivet-2.6.0.tar.bz2 -> Rivet-2.7.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/Rivet/Rivet-2.6.0.tar.bz2 /work/SRC/openSUSE:Factory/.Rivet.new.7948/Rivet-2.7.2.tar.bz2 differ: char 11, line 1 ++++++ Rivet-fix-ambiguous-namespace.patch ++++++ diff -r a48f0f1c34c8 -r 1741862a1b97 analyses/pluginCMS/CMS_2013_I1223519.cc --- a/analyses/pluginCMS/CMS_2013_I1223519.cc Fri May 24 15:08:51 2019 +0000 +++ b/analyses/pluginCMS/CMS_2013_I1223519.cc Tue May 28 14:39:35 2019 +0200 @@ -123,9 +123,9 @@ const Jets jets37 = filter_select(alljets, Cuts::Et > 37*GeV); const Jets jets43 = filter_select(jets37, Cuts::Et > 43*GeV); const Jets jets50 = filter_select(jets43, Cuts::Et > 50*GeV); - const double ht37 = sum(jets37, Et, 0.0); - const double ht43 = sum(jets43, Et, 0.0); - const double ht50 = sum(jets50, Et, 0.0); + const double ht37 = sum(jets37, Kin::Et, 0.0); + const double ht43 = sum(jets43, Kin::Et, 0.0); + const double ht50 = sum(jets50, Kin::Et, 0.0); // Find the relevant HT bin and apply leading jet event-selection cuts static const vector<double> htcuts = { /* 275., 325., */ 375., 475., 575., 675., 775., 875.}; //< comment to avoid jets50 "fall-down" @@ -153,7 +153,7 @@ // Compute DeltaHT = minimum difference of "dijet" ETs, i.e. max(|1+2-3|, |1+3-2|, |2+3-1|) double deltaht = -1; - vector<double> jetets; transform(jets, jetets, Et); + vector<double> jetets; transform(jets, jetets, Kin::Et); for (int i = 1; i < (1 << (jetets.size()-1)); ++i) { // count from 1 to 2**N-1, i.e. through all heterogeneous bitmasks with MSB(2**N)==0 const bitset<10> bits(i); /// @warning There'd better not be more than 10 jets... const double htdiff = partition_diff(bits, jetets); ++++++ sover.diff ++++++ --- /var/tmp/diff_new_pack.YdhuVq/_old 2019-08-27 10:22:16.647936005 +0200 +++ /var/tmp/diff_new_pack.YdhuVq/_new 2019-08-27 10:22:16.647936005 +0200 @@ -1,7 +1,7 @@ -Index: Rivet-2.6.0/src/Makefile.am +Index: Rivet-2.7.2/src/Makefile.am =================================================================== ---- Rivet-2.6.0.orig/src/Makefile.am -+++ Rivet-2.6.0/src/Makefile.am +--- Rivet-2.7.2.orig/src/Makefile.am ++++ Rivet-2.7.2/src/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libRivet.la libRivet_la_SOURCES =
