[Rivet-svn] rivet: merge from release branch

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/de2b657ad866
branches:  
changeset: 6226:de2b657ad866
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Wed Jan 31 09:15:23 2018 +0000
description:
merge from release branch

diffs (truncated from 1317 to 50 lines):

--- a/.hgignore	Sat Jan 27 21:27:53 2018 +0000
+++ b/.hgignore	Wed Jan 31 09: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/ChangeLog	Sat Jan 27 21:27:53 2018 +0000
+++ b/ChangeLog	Wed Jan 31 09:15:23 2018 +0000
@@ -1,3 +1,7 @@
+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.
--- a/analyses/pluginATLAS/ATLAS_2011_I928289_W.info	Sat Jan 27 21:27:53 2018 +0000
+++ b/analyses/pluginATLAS/ATLAS_2011_I928289_W.info	Wed Jan 31 09:15:23 2018 +0000
@@ -13,9 +13,9 @@
  - arXiv:1109.5141 [hep-ex]
 RunInfo:
   p + p -> W + X ( W -> mu nu or e nu )
-  The histograms include the W charge asymmetry. Note that the charge asymmetry histograms may
-  need to be constructed manually from the individual W^+ and W^- channels if the analysis is 
-  run on individual files. A_l = (W^+ - W^-) / (W^+ + W^-)
+  The histograms include the $W$ charge asymmetry. Note that the charge asymmetry histograms may
+  need to be constructed manually from the individual $W^+$ and $W^-$ channels if the analysis is
+  run on individual files. $A_l = (W^+ - W^-) / (W^+ + W^-)$
 NumEvents: 1000000
 NeedCrossSection: yes
 Beams: [p+, p+]
@@ -23,14 +23,14 @@
 PtCuts: [20]
 Description:
   The production cross sections of the inclusive Drell-Yan process $W^\pm \rightarrow \ell\nu$
-  ($\ell = e, µ$) are measured in proton-proton collisions at $\sqrt{s} = 7$~TeV with the ATLAS detector.
+  ($\ell = e, \mu$) are measured in proton-proton collisions at $\sqrt{s} = 7$~TeV with the ATLAS detector.
   The cross sections are evaluated differentially as a function of the $W$ boson rapidity based on an
-  integrated luminosity of about 35~$\text{pb}^{−1}$ collected in 2010. The cross sections are measured 
+  integrated luminosity of about 35~$\text{pb}^{-1}$ collected in 2010. The cross sections are measured
   separately for $W^+$ and $W^-$ production, and then used to construct the $W$ charge asymmetry as well.
 BibKey: Aad:2011dm
 BibTeX: '@article{Aad:2011dm,
       author         = "Aad, Georges and others",
-      title          = "{Measurement of the inclusive $W^\pm$ and Z/gamma cross