[Rivet-svn] rivet: 11 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/a4c09e565355
branches:  release-2-2-x
changeset: 4790:a4c09e565355
user:      Chris Pollard <cspollard at gmail.com>
date:      Sat May 23 10:26:25 2015 +0100
description:
adding PlotXTickLabels and PlotYTickLabels options to make-plots

details:   https://rivet.hepforge.org/hg/rivet/rev/ff41e70087ee
branches:  release-2-2-x
changeset: 4791:ff41e70087ee
user:      Chris Pollard <cspollard at gmail.com>
date:      Sat May 23 10:27:00 2015 +0100
description:
merging

details:   https://rivet.hepforge.org/hg/rivet/rev/ae651ce0abf3
branches:  release-2-2-x
changeset: 4792:ae651ce0abf3
user:      Chris Pollard <cspollard at gmail.com>
date:      Wed Jul 01 14:04:32 2015 +0100
description:
allow custom X and Y axis ticks

details:   https://rivet.hepforge.org/hg/rivet/rev/dfd4123cb317
branches:  release-2-2-x
changeset: 4793:dfd4123cb317
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 15:08:13 2015 +0100
description:
adding ATLAS_2015_I1345452

details:   https://rivet.hepforge.org/hg/rivet/rev/12d638412a26
branches:  
changeset: 4794:12d638412a26
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 15:10:58 2015 +0100
description:
merging in changes.

details:   https://rivet.hepforge.org/hg/rivet/rev/6287d4aa460d
branches:  
changeset: 4795:6287d4aa460d
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 15:29:06 2015 +0100
description:
merging again.

details:   https://rivet.hepforge.org/hg/rivet/rev/b5182d9b630f
branches:  release-2-2-x
changeset: 4796:b5182d9b630f
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 15:29:58 2015 +0100
description:
merging.

details:   https://rivet.hepforge.org/hg/rivet/rev/907c9a8ac799
branches:  
changeset: 4797:907c9a8ac799
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 15:30:24 2015 +0100
description:
one last merge.

details:   https://rivet.hepforge.org/hg/rivet/rev/283b9af6e9fa
branches:  
changeset: 4798:283b9af6e9fa
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 16:17:01 2015 +0100
description:
adding ATLAS_2014_I1298023

details:   https://rivet.hepforge.org/hg/rivet/rev/8d2424e36b80
branches:  
changeset: 4799:8d2424e36b80
user:      Chris Pollard <cspollard at gmail.com>
date:      Mon Jul 06 16:37:58 2015 +0100
description:
adding ATLAS_2014_I1319490.

details:   https://rivet.hepforge.org/hg/rivet/rev/233b0fab41d1
branches:  release-2-2-x
changeset: 4800:233b0fab41d1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jul 07 09:04:57 2015 +0100
description:
closed branch again

diffs (truncated from 935 to 50 lines):

--- a/bin/make-plots	Tue May 19 18:52:50 2015 +0100
+++ b/bin/make-plots	Tue Jul 07 09:04:57 2015 +0100
@@ -573,15 +573,15 @@
             for i in range(len(FOO)):
                 xcustomminorticks.append({'Value': float(FOO[i])})
         xticks = XTicks(inputdata.description, self.coors)
-        if (inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1') or (inputdata.description.has_key('PlotTickLabels') and inputdata.description['PlotTickLabels']=='0'):
-            drawlabels=False
+        if (inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1') or (inputdata.description.has_key('PlotXTickLabels') and inputdata.description['PlotXTickLabels']=='0'):
+            drawxlabels=False
         else:
-            drawlabels=True
+            drawxlabels=True
         out += xticks.draw(custommajortickmarks=xcustommajortickmarks,\
                            customminortickmarks=xcustomminortickmarks,\
                            custommajorticks=xcustommajorticks,\
                            customminorticks=xcustomminorticks,\
-                           drawlabels=drawlabels)
+                           drawlabels=drawxlabels)
 
         if inputdata.description.has_key('YMajorTickMarks') and inputdata.description['YMajorTickMarks']!='':
             ycustommajortickmarks=int(inputdata.description['YMajorTickMarks'])
@@ -609,10 +609,15 @@
             for i in range(len(FOO)):
                 ycustomminorticks.append({'Value': float(FOO[i])})
         yticks = YTicks(inputdata.description, self.coors)
+        if (inputdata.description.has_key('PlotYTickLabels') and inputdata.description['PlotYTickLabels']=='0'):
+            drawylabels=False
+        else:
+            drawylabels=True
         out += yticks.draw(custommajortickmarks=ycustommajortickmarks,\
                            customminortickmarks=ycustomminortickmarks,\
                            custommajorticks=ycustommajorticks,\
-                           customminorticks=ycustomminorticks)
+                           customminorticks=ycustomminorticks,
+                           drawlabels=drawylabels)
 
         labels = Labels(inputdata.description)
         if inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1':
@@ -1010,11 +1015,16 @@
             FOO=self.description['ZCustomMinorTicks'].strip().split('\t')
             for i in range(len(FOO)):
                 zcustomminorticks.append({'Value': float(FOO[i])})
+        if (self.description.has_key('PlotZTickLabels') and self.description['PlotZTickLabels']=='0'):
+            drawzlabels=False
+        else:
+            drawzlabels=True
         zticks = ZTicks(self.description, self.coors)
         out += zticks.draw(custommajortickmarks=zcustommajortickmarks,\
                            customminortickmarks=zcustomminortickmarks,\