[Rivet-svn] rivet: Merge from trunk (to get 2.6)

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/050ec56380d9
branches:  multiweight
changeset: 6228:050ec56380d9
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Jan 31 11:15:23 2018 +0000
description:
Merge from trunk (to get 2.6)

diffs (truncated from 188821 to 50 lines):

--- a/.hgignore	Thu Nov 23 09:39:04 2017 +0000
+++ b/.hgignore	Wed Jan 31 11:15:23 2018 +0000
@@ -49,7 +49,7 @@
 ^include/Rivet/Config/DummyConfig\.hh$
 ^include/Rivet/Config/RivetConfig\.hh$
 ^doc/.*\.(log|aux|out)$
-^doc/diffanas$
+^doc/ana
 ^test/log$
 ^test/.*\.log$
 ^test/out\.yoda$
--- a/.hgtags	Thu Nov 23 09:39:04 2017 +0000
+++ b/.hgtags	Wed Jan 31 11:15:23 2018 +0000
@@ -72,3 +72,4 @@
 8a05acecd26c18f368f4b748da2d5aa2db46be6c rivet-2.5.2
 ad44338e2fa10dd81e2b306545b801ce53f31921 rivet-2.5.3
 d16ae7b046d6d448dc70d23dafcce12626eb47c9 rivet-2.5.4
+0fa6eb1b4cc025984da306968ba88ba602c90fc7 rivet-2.6.0
--- a/ChangeLog	Thu Nov 23 09:39:04 2017 +0000
+++ b/ChangeLog	Wed Jan 31 11:15:23 2018 +0000
@@ -1,3 +1,35 @@
+2018-01-08  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add highlighted source to HTML analysis metadata listings.
+
+2017-12-21  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Version 2.6.0 release.
+
+2017-12-20  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Typo fix in TOTEM_2012_I1220862 data -- thanks to Anton Karneyeu.
+
+2017-12-19  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Adding contributed analyses: 1 ALICE, 6 ATLAS, 1 CMS.
+
+	* Fix bugged PID codes in MC_PRINTEVENT.
+
+2017-12-13  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Protect Run methods and rivet script against being told to run from a missing or unreadable file.
+
+2017-12-11  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Replace manual event count & weight handling with a YODA Counter object.
+
+2017-11-28  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Providing neater & more YODA-consistent sumW and sumW2 methods on AnalysisHandler and Analysis.