[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/cc2abe5a3bda
branches:  release-2-4-x
changeset: 4935:cc2abe5a3bda
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 23 23:03:37 2015 +0000
description:
More helful debug printout

details:   https://rivet.hepforge.org/hg/rivet/rev/f9fe0cddac89
branches:  release-2-4-x
changeset: 4936:f9fe0cddac89
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Nov 23 23:03:49 2015 +0000
description:
Better handling of empty plots

details:   https://rivet.hepforge.org/hg/rivet/rev/1615c5e1bfce
branches:  release-2-4-x
changeset: 4937:1615c5e1bfce
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Nov 25 10:24:17 2015 +0000
description:
Protect make-plots against lock-up due to partial pstricks command when there are no data points.

diffs (truncated from 268 to 50 lines):

--- a/ChangeLog	Tue Nov 17 23:02:36 2015 +0000
+++ b/ChangeLog	Wed Nov 25 10:24:17 2015 +0000
@@ -1,3 +1,7 @@
+2015-11-25  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Protect make-plots against lock-up due to partial pstricks command when there are no data points.
+
 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.
--- a/bin/make-plots	Tue Nov 17 23:02:36 2015 +0000
+++ b/bin/make-plots	Wed Nov 25 10:24:17 2015 +0000
@@ -1601,97 +1601,101 @@
         out = ""
         out += self.startclip()
         out += self.startpsset()
-        #
-        if self.is2dim:
-            for i in range(len(self.data)):
-                out += ('\\psframe')
-                color=int(129*coors.phys2frameZ(self.data[i]['Content']))
-                if self.data[i]['Content']>coors.zmax():
-                    color=129
-                if self.data[i]['Content']<coors.zmin():
-                    color=0
-                if self.data[i]['Content']<=coors.zmin():
-                    out += ('[linewidth=0pt, linestyle=none, fillstyle=solid, fillcolor=white]')
+        if self.data:
+            out += "% START DATA\n"
+            if self.is2dim:
+                for i in xrange(len(self.data)):
+                    out += ('\\psframe')
+                    color=int(129*coors.phys2frameZ(self.data[i]['Content']))
+                    if self.data[i]['Content']>coors.zmax():
+                        color=129
+                    if self.data[i]['Content']<coors.zmin():
+                        color=0
+                    if self.data[i]['Content']<=coors.zmin():
+                        out += ('[linewidth=0pt, linestyle=none, fillstyle=solid, fillcolor=white]')
+                    else:
+                        out += ('[linewidth=0pt, linestyle=none, fillstyle=solid, fillcolor={gradientcolors!!['+str(color)+']}]')
+                    out += ('(' + coors.strphys2frameX(self.data[i]['LowEdge'][0]) + ', ' \
+                                + coors.strphys2frameY(self.data[i]['LowEdge'][1]) + ')(' \
+                                + coors.strphys2frameX(self.data[i]['UpEdge'][0])  + ', ' \
+                                + coors.strphys2frameY(self.data[i]['UpEdge'][1])  + ')\n')
+            else:
+                if self.getErrorBands():
+                    self.description['SmoothLine']=0
+                    for i in xrange(len(self.data)):
+                        out += ('\\psframe[dimen=inner,linewidth=0pt,linestyle=none,fillstyle=solid,fillcolor=%s,opacity=%s]' %(self.getErrorBandColor(),self.getErrorBandOpacity()))