[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/60012db6d270
branches:  release-2-5-x
changeset: 5566:60012db6d270
user:      Andy Buckley <andy at insectnation.org>
date:      Sun Oct 16 16:51:34 2016 +0100
description:
More make-plots fixes from Dmitry Kalinkin

details:   https://rivet.hepforge.org/hg/rivet/rev/35bab4849856
branches:  release-2-5-x
changeset: 5567:35bab4849856
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Oct 17 10:59:33 2016 +0100
description:
Final 2D plotting z-tick fix

diffs (truncated from 2790 to 50 lines):

--- a/bin/make-plots	Wed Oct 12 17:13:55 2016 +0100
+++ b/bin/make-plots	Mon Oct 17 10:59:33 2016 +0100
@@ -1156,18 +1156,18 @@
         zcustommajorticks = zcustomminorticks = None
         if self.attr('ZCustomMajorTicks'):
             zcustommajorticks = []
-            z_label_pairs = inputdata.attr('ZCustomMajorTicks').strip().split() #'\t')
+            z_label_pairs = self.attr('ZCustomMajorTicks').strip().split() #'\t')
             if len(z_label_pairs) % 2 == 0:
                 for i in range(0, len(z_label_pairs), 2):
                     zcustommajorticks.append({'Value': float(x_label_pairs[i]), 'Label': x_label_pairs[i+1]})
             else:
                 print "Warning: ZCustomMajorTicks requires an even number of alternating pos/label entries"
 
-        if inputdata.attr('ZCustomMinorTicks'):
-            zs = inputdata.attr('ZCustomMinorTicks').strip().split() #'\t')
+        if self.attr('ZCustomMinorTicks'):
+            zs = self.attr('ZCustomMinorTicks').strip().split() #'\t')
             zcustomminorticks = [{'Value': float(x)} for x in xs]
 
-        drawzlabels = self.description.attr_bool('PlotZTickLabels', True)
+        drawzlabels = self.attr_bool('PlotZTickLabels', True)
 
         zticks = ZTicks(self.description, self.coors)
         out += zticks.draw(custommajortickmarks=zcustommajortickmarks,\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/make-plots-fast	Mon Oct 17 10:59:33 2016 +0100
@@ -0,0 +1,2762 @@
+#! /usr/bin/env python
+
+"""\
+Usage: %prog [options] file.dat [file2.dat ...]
+
+TODO
+ * Optimise output for e.g. lots of same-height bins in a row
+ * Add a RatioFullRange directive to show the full range of error bars + MC envelope in the ratio
+ * Tidy LaTeX-writing code -- faster to compile one doc only, then split it?
+ * Handle boolean values flexibly (yes, no, true, false, etc. as well as 1, 0)
+"""
+
+##
+## This program is copyright by Hendrik Hoeth <hoeth at linta.de> and
+## the Rivet team https://rivet.hepforge.org. It may be used
+## for scientific and private purposes. Patches are welcome, but please don't
+## redistribute changed versions yourself.
+##
+
+## Check the Python version
+import sys
+if sys.version_info[:3] < (2,6,0):