[Rivet-svn] rivet: 6 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/99593147eae5
branches:  release-2-5-x
changeset: 5663:99593147eae5
user:      Andy Buckley <andy at insectnation.org>
date:      Thu Jan 12 12:29:01 2017 +0000
description:
Tweak examples, removing mention of agile-runmc

details:   https://rivet.hepforge.org/hg/rivet/rev/e2b8fd75d7be
branches:  release-2-5-x
changeset: 5664:e2b8fd75d7be
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jan 16 16:44:06 2017 +0000
description:
Add Vector3::abseta()

details:   https://rivet.hepforge.org/hg/rivet/rev/51ea7f16eb09
branches:  release-2-5-x
changeset: 5665:51ea7f16eb09
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jan 16 16:58:52 2017 +0000
description:
Add ParticleEffFilter and JetEffFilter constructors from a double (encoding constant efficiency).

details:   https://rivet.hepforge.org/hg/rivet/rev/a440fdc45fa9
branches:  release-2-5-x
changeset: 5666:a440fdc45fa9
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jan 16 20:31:51 2017 +0000
description:
Convert FinalState particles() accessors to use std::function rather than a template arg for sorting, and add filtering functor support -- including a mix of filtering and sorting functors. Yay for C++11! Now to tidy it up

details:   https://rivet.hepforge.org/hg/rivet/rev/d71cb6eb868d
branches:  release-2-5-x
changeset: 5667:d71cb6eb868d
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jan 16 21:09:48 2017 +0000
description:
Tidy FinalState filtering and sorting functor code via new type aliases in ParticleBaseUtils.hh, ParticleUtils.hh, and JetUtils.hh

details:   https://rivet.hepforge.org/hg/rivet/rev/04c528968a0a
branches:  release-2-5-x
changeset: 5668:04c528968a0a
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jan 16 21:26:17 2017 +0000
description:
Merge

diffs (truncated from 266 to 50 lines):

--- a/ChangeLog	Mon Jan 09 15:38:35 2017 +0000
+++ b/ChangeLog	Mon Jan 16 21:26:17 2017 +0000
@@ -1,3 +1,14 @@
+2017-01-16  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Convert FinalState particles() accessors to use std::function
+	rather than a template arg for sorting, and add filtering functor
+	support -- including a mix of filtering and sorting functors. Yay
+	for C++11!
+
+	* Add ParticleEffFilter and JetEffFilter constructors from a double (encoding constant efficiency).
+
+	* Add Vector3::abseta()
+
 2016-12-13  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version 2.5.3 release.
--- a/bin/make-plots	Mon Jan 09 15:38:35 2017 +0000
+++ b/bin/make-plots	Mon Jan 16 21:26:17 2017 +0000
@@ -1000,7 +1000,7 @@
                            custommajorticks=ycustommajorticks,
                            customminorticks=ycustomminorticks)
 
-        if not inputdata.attr_bool('MainPlot', True) and not inputdata.attr_bool('Legend', False):
+        if not inputdata.attr_bool('MainPlot', True) and inputdata.attr_bool('Legend', False):
             legend = Legend(inputdata.description, inputdata.histos, inputdata.functions)
             out += legend.draw()
 
--- a/bin/rivet	Mon Jan 09 15:38:35 2017 +0000
+++ b/bin/rivet	Mon Jan 16 21:26:17 2017 +0000
@@ -4,9 +4,14 @@
 Run Rivet analyses on inputted events from file or Unix pipe
 
 Examples:
+
   %prog [options] <hepmcfile> [<hepmcfile2> ...]
-  my_generator -o myfifo & \ %prog [options] myfifo
-  agile-runmc <genname> -n 100k -o- | %prog [options]
+
+  or
+
+  my_generator -o fifo.hepmc &
+  %prog [options] fifo.hepmc
+
 
 ENVIRONMENT:
  * RIVET_ANALYSIS_PATH: list of paths to be searched for plugin
--- a/include/Rivet/Math/Vector3.hh	Mon Jan 09 15:38:35 2017 +0000
+++ b/include/Rivet/Math/Vector3.hh	Mon Jan 16 21:26:17 2017 +0000
@@ -174,9 +174,11 @@