[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/a030547a7c9e
branches:  release-2-4-x
changeset: 4976:a030547a7c9e
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Feb 16 21:39:52 2016 +0000
description:
Fix to rivet-cmphistos to avoid overwriting RatioPlotYLabel if already set via e.g. the PLOT pseudo-file. Thanks to Johann Felix v. Soden-Fraunhofen.

details:   https://rivet.hepforge.org/hg/rivet/rev/98f9010478a1
branches:  release-2-4-x
changeset: 4977:98f9010478a1
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Feb 16 22:42:31 2016 +0000
description:
Apply cross-section unit fixes and plot styling improvements to ATLAS_2013_I1217863 analyses, thanks to Christian Gutschow.

details:   https://rivet.hepforge.org/hg/rivet/rev/3daf7e232039
branches:  release-2-4-x
changeset: 4978:3daf7e232039
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Feb 16 22:49:58 2016 +0000
description:
Conversion to uniform Unix line endings

details:   https://rivet.hepforge.org/hg/rivet/rev/da26ecabfc64
branches:  release-2-4-x
changeset: 4979:da26ecabfc64
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Feb 16 22:50:24 2016 +0000
description:
Data conversion to uniform Unix line endings

diffs (truncated from 7152 to 50 lines):

--- a/ChangeLog	Mon Feb 15 22:51:50 2016 +0000
+++ b/ChangeLog	Tue Feb 16 22:50:24 2016 +0000
@@ -1,3 +1,12 @@
+2016-02-16  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Apply cross-section unit fixes and plot styling improvements to
+	ATLAS_2013_I1217863 analyses, thanks to Christian Gutschow.
+
+	* Fix to rivet-cmphistos to avoid overwriting RatioPlotYLabel if
+	already set via e.g. the PLOT pseudo-file. Thanks to Johann Felix
+	v. Soden-Fraunhofen.
+
 2016-02-15  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Add Analysis::bookCounter and some machinery in rivet-cmphistos
--- a/bin/rivet-cmphistos	Mon Feb 15 22:51:50 2016 +0000
+++ b/bin/rivet-cmphistos	Tue Feb 16 22:50:24 2016 +0000
@@ -441,7 +441,7 @@
         if showratio and len(varlines + mainlines) > 1:
             plot['RatioPlot'] = '1'
             plot['RatioPlotReference'] = ratioreference
-            if not hasdataref:
+            if not hasdataref and not plot.has_key("RatioPlotYLabel"):
                 if plot.get('RatioPlotMode', '') == 'deviation':
                     plot['RatioPlotYLabel'] = 'Deviation' #r'$\text{MC}-\text{MC}_\text{ref}$'
                 else:
--- a/data/anainfo/CMS_2013_I1224539_DIJET.info	Mon Feb 15 22:51:50 2016 +0000
+++ b/data/anainfo/CMS_2013_I1224539_DIJET.info	Tue Feb 16 22:50:24 2016 +0000
@@ -1,41 +1,41 @@
-Name: CMS_2013_I1224539_DIJET
-Year: 2013
-Summary: CMS jet mass measurement in dijet events
-Experiment: CMS
-Collider: LHC
-InspireID: 1224539
-Status: VALIDATED
-Authors:
- - salvatore.rappoccio at cern.ch
- - ntran at fnal.gov
- - kalanand at fnal.gov
- - dlopes at mail.cern.ch
-RunInfo:
-  7 TeV $pp$ collisions. Events are required to have at least 2 jets with
-  $(\pT_1 + \pT_2) / 2.0 > 220$ GeV with both jets satisfying $|y| < 2.4$.
-NumEvents: 200000
-NeedCrossSection: no
-Beams: [p+, p+]
-Energies: [7000]
-Description:
-  'Measurements of the mass spectra of the jets in dijet and $W/Z$+jet events from proton--proton