[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/8c16e966ae48
branches:  release-2-5-x
changeset: 5499:8c16e966ae48
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 20 10:44:34 2016 +0100
description:
Fix ChargedLeptons projection, which failed to exclude neutrinos!!! Thanks to Markus Seidel.

details:   https://rivet.hepforge.org/hg/rivet/rev/fa640fc7cac1
branches:  release-2-5-x
changeset: 5500:fa640fc7cac1
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Sep 20 10:57:38 2016 +0100
description:
Cosmetic tidying and @todos

diffs (truncated from 163 to 50 lines):

--- a/ChangeLog	Tue Sep 20 00:26:19 2016 +0100
+++ b/ChangeLog	Tue Sep 20 10:57:38 2016 +0100
@@ -1,5 +1,7 @@
 2016-09-20  Andy Buckley  <andy.buckley at cern.ch>
 
+	* Fix ChargedLeptons projection, which failed to exclude neutrinos!!! Thanks to Markus Seidel.
+
 	* Add templated FN filtering arg versions of the Jet::*Tags() and
 	Jet::*Tagged() functions.
 
--- a/include/Rivet/Particle.hh	Tue Sep 20 00:26:19 2016 +0100
+++ b/include/Rivet/Particle.hh	Tue Sep 20 10:57:38 2016 +0100
@@ -314,8 +314,11 @@
 
     /// @brief Shorthand definition of 'promptness' based on set definition flags
     ///
+    /// The boolean arguments allow a decay lepton to be considered prompt if
+    /// its parent was a "real" prompt lepton.
+    ///
     /// @note This one doesn't make any judgements about final-stateness
-    bool isPrompt(bool from_prompt_tau=false, bool from_prompt_mu=false) const;
+    bool isPrompt(bool allow_from_prompt_tau=false, bool allow_from_prompt_mu=false) const;
 
     //@}
 
--- a/include/Rivet/Projections/JetAlg.hh	Tue Sep 20 00:26:19 2016 +0100
+++ b/include/Rivet/Projections/JetAlg.hh	Tue Sep 20 10:57:38 2016 +0100
@@ -96,6 +96,10 @@
       // return rtn;
     }
 
+
+    /// @todo Want to add a general filtering function, but that clashes with the sorting functor... SFINAE?
+
+
     /// Get the jets, ordered by supplied sorting function object, with optional cuts on \f$ p_\perp \f$ and rapidity.
     /// @note Returns a copy rather than a reference, due to cuts and sorting
     template <typename F>
--- a/include/Rivet/Projections/ParticleFinder.hh	Tue Sep 20 00:26:19 2016 +0100
+++ b/include/Rivet/Projections/ParticleFinder.hh	Tue Sep 20 10:57:38 2016 +0100
@@ -58,12 +58,16 @@
       return rtn;
     }
 
+
+    /// @todo Want to add a general filtering function, but that clashes with the sorting functor... SFINAE?
+
+
     /// Get the final-state particles, ordered by supplied sorting function object.
     /// @note Returns a copy rather than a reference, due to cuts and sorting