[Rivet-svn] rivet: 5 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/e36a60da238a
branches:  release-2-5-x
changeset: 5311:e36a60da238a
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 11 16:54:04 2016 +0100
description:
Update to C++11

details:   https://rivet.hepforge.org/hg/rivet/rev/874135abb175
branches:  release-2-5-x
changeset: 5312:874135abb175
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 11 16:54:20 2016 +0100
description:
Passing more flags from rivet-mkhtml to make-plots

details:   https://rivet.hepforge.org/hg/rivet/rev/beb1f6eaa5c7
branches:  release-2-5-x
changeset: 5313:beb1f6eaa5c7
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 18 21:49:10 2016 +0100
description:
Robustness improvements against empty/all-NaN plots

details:   https://rivet.hepforge.org/hg/rivet/rev/0525da52d40a
branches:  release-2-5-x
changeset: 5314:0525da52d40a
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 18 21:51:33 2016 +0100
description:
Add a warning message

details:   https://rivet.hepforge.org/hg/rivet/rev/fa74fdf1e9d5
branches:  release-2-5-x
changeset: 5315:fa74fdf1e9d5
user:      Andy Buckley <andy at insectnation.org>
date:      Mon Jul 18 21:52:28 2016 +0100
description:
Merge

diffs (truncated from 335 to 50 lines):

--- a/bin/make-plots	Thu Jul 07 16:31:55 2016 +0100
+++ b/bin/make-plots	Mon Jul 18 21:52:28 2016 +0100
@@ -781,12 +781,14 @@
 
         labels = Labels(inputdata.description)
         if inputdata.description.has_key('RatioPlot') and inputdata.description['RatioPlot']=='1':
-            out += labels.draw(['Title','YLabel'])
+            olab = labels.draw(['Title','YLabel'])
         else:
             if not inputdata.description['is2dim']:
-                out += labels.draw(['Title','XLabel','YLabel'])
+                olab = labels.draw(['Title','XLabel','YLabel'])
             else:
-                out += labels.draw(['Title','XLabel','YLabel','ZLabel'])
+                olab = labels.draw(['Title','XLabel','YLabel','ZLabel'])
+        #print olab
+        out += olab
         return out
 
     def calculate_gof(self, inputdata):
@@ -1478,6 +1480,18 @@
         return hasattr(self.low, "__len__") and hasattr(self.high, "__len__")
 
     @property
+    def isValid(self):
+        invalid_val = (isnan(self.val) or isnan(self.err[0]) or isnan(self.err[1]))
+        if invalid_val:
+            return False
+        if self.is2D:
+            invalid_low = any(isnan(x) for x in self.low)
+            invalid_high = any(isnan(x) for x in self.high)
+        else:
+            invalid_low, invalid_high = isnan(self.low), isnan(self.high)
+        return not (invalid_low or invalid_high)
+
+    @property
     def xmin(self):
         return self.low
     @xmin.setter
@@ -1807,7 +1821,7 @@
         out = ""
         out += self.startclip()
         out += self.startpsset()
-        if self.data:
+        if any(b.isValid for b in self.data):
             out += "% START DATA\n"
             if self.is2dim:
                 for b in self.data:
@@ -1829,7 +1843,7 @@
                 if self.getErrorBands():