[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/215633a50153
branches:  release-2-4-x
changeset: 4933:215633a50153
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Nov 17 23:01:22 2015 +0000
description:
rivet-cmphistos: Use a ratio label that doesn't mention 'data' when plotting MC vs. MC.

details:   https://rivet.hepforge.org/hg/rivet/rev/2ce5b929d62f
branches:  release-2-4-x
changeset: 4934:2ce5b929d62f
user:      Andy Buckley <andy at insectnation.org>
date:      Tue Nov 17 23:02:36 2015 +0000
description:
Use more generic labels in MC-MC plotting

diffs (truncated from 56 to 50 lines):

--- a/ChangeLog	Fri Nov 13 16:59:33 2015 +0000
+++ b/ChangeLog	Tue Nov 17 23:02:36 2015 +0000
@@ -1,3 +1,7 @@
+2015-11-17  Andy Buckley  <andy.buckley at cern.ch>
+
+	* rivet-cmphistos: Use a ratio label that doesn't mention 'data' when plotting MC vs. MC.
+
 2015-11-12  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Tweak plot and subplot sizing defaults in make-plots so the
--- a/bin/make-plots	Fri Nov 13 16:59:33 2015 +0000
+++ b/bin/make-plots	Tue Nov 17 23:02:36 2015 +0000
@@ -706,6 +706,7 @@
         inputdata.description['RatioPlotStage'] = True
         inputdata.description['PlotSizeY'] = inputdata.description['RatioPlotSizeY']
         inputdata.description['LogY'] = False
+        # TODO: It'd be nice it this wasn't so MC-specific
         if inputdata.description.has_key('RatioPlotMode') and inputdata.description['RatioPlotMode']=='deviation':
             inputdata.description['YLabel']='$(\\text{MC}-\\text{data})$'
             inputdata.description['YMin']=-3.5
@@ -719,7 +720,7 @@
             inputdata.description['YMin']=0.5
             inputdata.description['YMax']=1.5
         if inputdata.description.has_key('RatioPlotYLabel'):
-            inputdata.description['YLabel']=inputdata.description['RatioPlotYLabel']
+            inputdata.description['YLabel'] = inputdata.description['RatioPlotYLabel']
         inputdata.description['YLabel']='\\rput(-%s,0){%s}'%(0.5*inputdata.description['PlotSizeY']/inputdata.description['PlotSizeX'],inputdata.description['YLabel'])
         if inputdata.description.has_key('RatioPlotYMin'):
             inputdata.description['YMin']=inputdata.description['RatioPlotYMin']
--- a/bin/rivet-cmphistos	Fri Nov 13 16:59:33 2015 +0000
+++ b/bin/rivet-cmphistos	Tue Nov 17 23:02:36 2015 +0000
@@ -326,8 +326,9 @@
 
 
         ## Handle reference data histogram, if there is one
-        ratioreference = None
+        ratioreference, hasdataref = None, False
         if refhistos.has_key('/REF' + hpath):
+            hasdataref = True
             refdata = refhistos['/REF' + hpath]
             refdata.setAnnotation('Title', 'Data')
             if not is2d:
@@ -381,6 +382,13 @@
         if showratio and len(drawonly) > 1:
             plot['RatioPlot'] = '1'
             plot['RatioPlotReference'] = ratioreference
+            if not hasdataref:
+                if plot.get('RatioPlotMode', '') == 'deviation':
+                    plot['RatioPlotYLabel'] = 'Deviation' #r'$\text{MC}-\text{MC}_\text{ref}$'
+                else: