Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:13.2:Update
Rivet
0001-fix_YODA_Histo1D_includes.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-fix_YODA_Histo1D_includes.patch of Package Rivet
From: Shawn W Dunn <sfalken@opensuse.org> 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 }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor