[Rivet-svn] rivet: merged from default

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/a230d590f199
branches:  multiweight
changeset: 5535:a230d590f199
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Sep 28 15:08:26 2016 +0100
description:
merged from default

diffs (truncated from 25669 to 50 lines):

--- a/.hgtags	Wed Sep 28 12:26:06 2016 +0100
+++ b/.hgtags	Wed Sep 28 15:08:26 2016 +0100
@@ -59,3 +59,14 @@
 28324a9ab8e39c73376934594e08f872bc442a76 rivet-2.4.3
 af77fa6d1c6408c7d8d70ff681996ee614cc6117 rivet-2.5.0beta1
 e46470f99190ee58a8f5cbc4c9788867e6b06d30 rivet-2.5.0beta2
+6342afb6b879ed61b8988c4521480a9f8406e1aa rivet-2.5.0
+af77fa6d1c6408c7d8d70ff681996ee614cc6117 rivet-2.5.0beta1
+0000000000000000000000000000000000000000 rivet-2.5.0beta1
+e46470f99190ee58a8f5cbc4c9788867e6b06d30 rivet-2.5.0beta2
+0000000000000000000000000000000000000000 rivet-2.5.0beta2
+afdfca08d4df8a7a80ef980f4fd9324fa6a0263f rivet-2.5.1
+7ff482331c2ee005b60d6e4e9bb88dd523de3dc4 rivet-2.5.2
+7ff482331c2ee005b60d6e4e9bb88dd523de3dc4 rivet-2.5.2
+0000000000000000000000000000000000000000 rivet-2.5.2
+0000000000000000000000000000000000000000 rivet-2.5.2
+8a05acecd26c18f368f4b748da2d5aa2db46be6c rivet-2.5.2
--- a/ChangeLog	Wed Sep 28 12:26:06 2016 +0100
+++ b/ChangeLog	Wed Sep 28 15:08:26 2016 +0100
@@ -1,3 +1,359 @@
+2016-09-22  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Release version 2.5.2
+
+2016-09-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a requirement to DressedLeptons that the FinalState passed
+	as 'bareleptons' will be filtered to only contain charged leptons,
+	if that is not already the case. Thanks to Markus Seidel for the
+	suggestion.
+
+2016-09-21  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Add Simone Amoroso's plugin for hadron spectra (ALEPH_1995_I382179)
+
+	* Add Simone Amoroso's plugin for hadron spectra (OPAL_1993_I342766)
+
+2016-09-20  Holger Schulz  <holger.schulz at cern.ch>
+
+	* Add CMS ttbar analysis from contrib, mark validated (CMS_2016_I1473674)
+
+	* Extend rivet-mkhtml --booklet to also work with pdfmerge
+
+2016-09-20  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Fix make-plots automatic YMax calculation, which had a typo from code cleaning (mea culpa!).
+
+	* Fix ChargedLeptons projection, which failed to exclude neutrinos!!! Thanks to Markus Seidel.
+
+	* Add templated FN filtering arg versions of the Jet::*Tags() and