[Rivet-svn] rivet: Merge from 2.4.x branch (branch is still open)

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/dbc5698ff208
branches:  
changeset: 4964:dbc5698ff208
user:      Andy Buckley <andy at insectnation.org>
date:      Sat Dec 19 20:36:22 2015 +0000
description:
Merge from 2.4.x branch (branch is still open)

diffs (truncated from 130016 to 50 lines):

--- a/ChangeLog	Thu Nov 12 10:14:24 2015 +0000
+++ b/ChangeLog	Sat Dec 19 20:36:22 2015 +0000
@@ -1,3 +1,75 @@
+2015-12-15  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add cmphistos and make-plots machinery for handling 'suffix'
+	variations on plot paths, currently just by plotting every line,
+	with the variations in a 70% faded tint.
+
+	* Add Beam::pv() method for finding the beam interaction primary
+	vertex 4-position.
+
+	* Add a new Particle::setMomentum(E,x,y,z) method, and an origin
+	position member which is automatically populated from the
+	GenParticle, with access methods corresponding to the momentum
+	ones.
+
+2015-12-10  Andy Buckley  <andy.buckley at cern.ch>
+
+	* make-plots: improve custom tick attribute handling, allowing
+	empty lists. Also, any whitespace now counts as a tick separator
+	-- explicit whitespace in labels should be done via ~ or similar
+	LaTeX markup.
+
+2015-12-04  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Pro-actively use -m/-M arguments when initially loading
+	histograms in mkhtml, *before* passing them to cmphistos.
+
+2015-12-03  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Move contains() and has_key() functions on STL containers from std to Rivet namespaces.
+
+	* Adding IsRef attributes to all YODA refdata files; this will be
+	used to replace the /REF prefix in Rivet v3 onwards. The migration
+	has also removed leading # characters from BEGIN/END blocks, as
+	per YODA format evolution: new YODA versions as required by
+	current Rivet releases are able to read both the old and new
+	formats.
+
+2015-12-02  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add handling of a command-line PLOT 'file' argument to rivet-mkhtml, cf. rivet-cmphistos.
+
+	* Improvements to rivet-mkhtml behaviour re. consistency with
+	rivet-cmphistos in how muti-part histo paths are decomposed into
+	analysis-name + histo name, and removal of 'NONE' strings.
+
+2015-11-30  Andy Buckley  <andy.buckley at cern.ch>
+