Hello community,
here is the log from the commit of package Rivet for openSUSE:Factory checked in at 2014-09-26 10:52:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Rivet (Old)
and /work/SRC/openSUSE:Factory/.Rivet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Rivet"
Changes:
--------
--- /work/SRC/openSUSE:Factory/Rivet/Rivet.changes 2014-06-24 22:47:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.Rivet.new/Rivet.changes 2014-09-26 11:21:53.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 25 18:18:21 UTC 2014 - sfalken@opensuse.org
+
+- Added 0001-fix_YODA_Histo1D_includes.patch
+ fixed buildfailure due to YODA/Histo1D changing function names
+ Additionally fixed buildfailure from MAXINT being defined but not used
+ See https://www.hepforge.org/lists-archive/rivet/2014-September/005167.html
+
+-------------------------------------------------------------------
New:
----
0001-fix_YODA_Histo1D_includes.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Rivet.spec ++++++
--- /var/tmp/diff_new_pack.UKAISa/_old 2014-09-26 11:21:54.000000000 +0200
+++ /var/tmp/diff_new_pack.UKAISa/_new 2014-09-26 11:21:54.000000000 +0200
@@ -28,12 +28,15 @@
Source: http://www.hepforge.org/archive/rivet/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM Rivet-compatibility-with-old-boost.patch badshah400@gmail.com -- Fix foreach compatibility with boost < 1.50 and make Rivet build with openSUSE 12.3 again
Patch0: Rivet-compatibility-with-old-boost.patch
+# PATCH-FIX-UPSTREAM 0001-fix_YODA_Histo1D_includes.patch sfalken@opensuse.org -- Fix buildfailure in MathHeader.hh by updating for YODA changing from mean and stdDev to xMean and xStdDev
+Patch1: 0001-fix_YODA_Histo1D_includes.patch
BuildRequires: HepMC-devel
BuildRequires: YODA-devel >= 1.0.6
BuildRequires: boost-devel
BuildRequires: doxygen
BuildRequires: fastjet-devel
BuildRequires: fastjet-plugin-siscone-devel
+BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: pkg-config
BuildRequires: python-devel
@@ -106,6 +109,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
++++++ 0001-fix_YODA_Histo1D_includes.patch ++++++
From: Shawn W Dunn
Date: 2014-09-25 11:12:02.118348640 -0700
Subject: Fix buildfailure, due to changes in YODA/Histo1D.h
References: https://www.hepforge.org/lists-archive/rivet/2014-September/005167.html
Upstream: submitted
Index: Rivet-2.1.2/include/Rivet/Math/MathHeader.hh
===================================================================
--- Rivet-2.1.2.orig/include/Rivet/Math/MathHeader.hh
+++ Rivet-2.1.2/include/Rivet/Math/MathHeader.hh
@@ -42,7 +42,8 @@ namespace Rivet {
using std::isinf;
const double MAXDOUBLE = std::numeric_limits<double>::max();
- const double MAXINT = std::numeric_limits<int>::max();
+ /// MAXINT is being defined but not used, causing buildfailure
+ /// const double MAXINT = std::numeric_limits<int>::max();
/// A pre-defined value of \f$ \pi \f$.
const double PI = M_PI;
Index: Rivet-2.1.2/src/Analyses/CMS_2013_I1261026.cc
===================================================================
--- Rivet-2.1.2.orig/src/Analyses/CMS_2013_I1261026.cc
+++ Rivet-2.1.2/src/Analyses/CMS_2013_I1261026.cc
@@ -102,20 +102,20 @@ namespace Rivet {
void finalize() {
for (size_t i = 0; i < 5; ++i) {
// All trk mean pT vs Nch
- _h_AllTrkMeanPt->fill(_multBinCent[i], _th_AllTrkSpectrum[i].mean(), getMeanError(_th_AllTrkSpectrum[i]));
+ _h_AllTrkMeanPt->fill(_multBinCent[i], _th_AllTrkSpectrum[i].xMean(), getMeanError(_th_AllTrkSpectrum[i]));
// Soft trk mean pT vs Nch
- _h_SoftTrkMeanPt->fill(_multBinCent[i], _th_SoftTrkSpectrum[i].mean(), getMeanError(_th_SoftTrkSpectrum[i]));
+ _h_SoftTrkMeanPt->fill(_multBinCent[i], _th_SoftTrkSpectrum[i].xMean(), getMeanError(_th_SoftTrkSpectrum[i]));
// Intrajet trk mean pT vs Nch
- _h_IntrajetTrkMeanPt->fill(_multBinCent[i], _th_JetTrkSpectrum[i].mean(), getMeanError(_th_JetTrkSpectrum[i]));
+ _h_IntrajetTrkMeanPt->fill(_multBinCent[i], _th_JetTrkSpectrum[i].xMean(), getMeanError(_th_JetTrkSpectrum[i]));
// Intrajet leader trk mean pT vs Nch
- _h_IntrajetLeaderTrkMeanPt->fill(_multBinCent[i], _th_JetLTrkSpectrum[i].mean(), getMeanError(_th_JetLTrkSpectrum[i]));
+ _h_IntrajetLeaderTrkMeanPt->fill(_multBinCent[i], _th_JetLTrkSpectrum[i].xMean(), getMeanError(_th_JetLTrkSpectrum[i]));
// Jet mean pT vs Nch
- const double sem = (_h_JetSpectrum[i]->stdDev())/(sqrt(_h_JetSpectrum[i]->sumW())) / _h_JetSpectrum[i]->mean();
- _h_MeanJetPt->fill(_multBinCent[i], _h_JetSpectrum[i]->mean(), sem);
+ const double sem = (_h_JetSpectrum[i]->xStdDev())/(sqrt(_h_JetSpectrum[i]->sumW())) / _h_JetSpectrum[i]->xMean();
+ _h_MeanJetPt->fill(_multBinCent[i], _h_JetSpectrum[i]->xMean(), sem);
// Jet rates
_avJetRate5[i] = _jetCounter5GeV[i] / _passedEv[i];
@@ -135,8 +135,8 @@ namespace Rivet {
double getMeanError(const Histo1D& hist) {
- double SEM = hist.stdDev() / sqrt(hist.numEntries()); // Standard error of the mean
- return SEM / hist.mean(); // relative SEM
+ double SEM = hist.xStdDev() / sqrt(hist.numEntries()); // Standard error of the mean
+ return SEM / hist.xMean(); // relative SEM
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org