[Rivet-svn] rivet: 7 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/c58cf8de52fb
branches:  release-2-5-x
changeset: 5596:c58cf8de52fb
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Nov 15 15:37:23 2016 +0000
description:
Tidy docstring

details:   https://rivet.hepforge.org/hg/rivet/rev/d1c37ee35298
branches:  release-2-5-x
changeset: 5597:d1c37ee35298
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Nov 15 15:38:03 2016 +0000
description:
Rename TRKEFF functions to TRK_EFF cf. other particle types, and add eff filter docstrings

details:   https://rivet.hepforge.org/hg/rivet/rev/5d2db6c93357
branches:  release-2-5-x
changeset: 5598:5d2db6c93357
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Nov 15 15:38:53 2016 +0000
description:
Fix inverted particle efficiency filtering

details:   https://rivet.hepforge.org/hg/rivet/rev/efc4b5ddd65e
branches:  release-2-5-x
changeset: 5599:efc4b5ddd65e
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Nov 15 16:42:35 2016 +0000
description:
Fix constness requirements on ifilter_select() and Particle/JetEffFilter::operator().

details:   https://rivet.hepforge.org/hg/rivet/rev/b1a355d5e5cc
branches:  release-2-5-x
changeset: 5600:b1a355d5e5cc
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Nov 18 15:42:47 2016 +0000
description:
Fix missing YAML quote mark in rivet-mkanalysis

details:   https://rivet.hepforge.org/hg/rivet/rev/4c4f2afff6ab
branches:  release-2-5-x
changeset: 5601:4c4f2afff6ab
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Nov 19 21:29:05 2016 +0000
description:
Add Et(const ParticleBase&) unbound function.

details:   https://rivet.hepforge.org/hg/rivet/rev/0a21418e1390
branches:  release-2-5-x
changeset: 5602:0a21418e1390
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 21 22:38:36 2016 +0000
description:
Add weights to Cutflow/s functions.

diffs (truncated from 254 to 50 lines):

--- a/ChangeLog	Fri Nov 04 13:11:27 2016 +0000
+++ b/ChangeLog	Mon Nov 21 22:38:36 2016 +0000
@@ -1,3 +1,21 @@
+2016-11-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add weights to Cutflow/s functions.
+
+2016-11-19  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add Et(const ParticleBase&) unbound function.
+
+2016-11-18  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix missing YAML quote mark in rivet-mkanalysis.
+
+2016-11-15  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix constness requirements on ifilter_select() and Particle/JetEffFilter::operator().
+
+	* src/Analyses/ATLAS_2016_I1458270.cc: Fix inverted particle efficiency filtering.
+
 2016-10-24  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add rough ATLAS and CMS photon reco efficiency functions from
--- a/bin/rivet-mkanalysis	Fri Nov 04 13:11:27 2016 +0000
+++ b/bin/rivet-mkanalysis	Mon Nov 21 22:38:36 2016 +0000
@@ -297,7 +297,7 @@
 Description:
   '<A fairly long description, including what is measured
   and if possible what it is useful for in terms of MC validation
-  and tuning. Use LaTeX for maths like $\pT > 50\;\GeV$.>
+  and tuning. Use LaTeX for maths like $\pT > 50\;\GeV$.>'
 BibKey: %(ANABIBKEY)s
 BibTeX: '%(ANABIBTEX)s'
 ToDo:
--- a/include/Rivet/Math/MathUtils.hh	Fri Nov 04 13:11:27 2016 +0000
+++ b/include/Rivet/Math/MathUtils.hh	Mon Nov 21 22:38:36 2016 +0000
@@ -331,11 +331,15 @@
 
   /// @brief Return the bin index of the given value, @a val, given a vector of bin edges
   ///
+  /// An underflow always returns -1. If allow_overflow is false (default) an overflow
+  /// also returns -1, otherwise it returns the Nedge-1, the index of an inclusive bin
+  /// starting at the last edge.
+  ///
   /// @note The @a binedges vector must be sorted
   /// @todo Use std::common_type<NUM1, NUM2>::type x = val; ?
   template <typename NUM1, typename NUM2>
-  inline typename std::enable_if<std::is_arithmetic<NUM1>::value && std::is_floating_point<NUM2>::value, int>::type
-    binIndex(NUM1 val, const vector<NUM2>& binedges, bool allow_overflow=false) {