Changeset 5d80bbf in sasmodels

Timestamp:

Nov 19, 2015 6:50:00 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

525f3a9

Parents:

66ebdd6

Message:

don't plot empty plots on log scale

File:

• sasmodels/bumps_model.py (modified) (6 diffs)

sasmodels/bumps_model.py

@@ -35 +35 @@
 import datetime
 import warnings
+import traceback
 
 import numpy as np
@@ -216 +217 @@
         Boxcut(x_min=-np.inf, x_max=np.inf, y_min=-np.inf, y_max=cutoff)(data)
 
-
+def protect(fn):
+    def wrapper(*args, **kw):
+        try: 
+            return fn(*args, **kw)
+        except:
+            traceback.print_exc()
+    return wrapper
+
+@protect
 def _plot_result1D(data, theory, resid, view, include_data=True):
     """
@@ -234 +243 @@
         plt.subplot(121)
 
+    positive = False
     if include_data:
         plt.errorbar(data.x, scale*mdata, yerr=data.dy, fmt='.')
+        positive = positive or (mdata>0).any()
     if theory is not None:
         mtheory = masked_array(theory, mdata.mask)
         plt.plot(data.x, scale*mtheory, '-', hold=True)
+        positive = positive or (mtheory>0).any()
     plt.xscale(view)
-    plt.yscale('linear' if view == 'q4' else view)
+    plt.yscale('linear' if view == 'q4' or not positive else view)
     plt.xlabel('Q')
     plt.ylabel('I(Q)')
@@ -252 +264 @@
 
 # pylint: disable=unused-argument
+@protect
 def _plot_sesans(data, theory, resid, view):
     import matplotlib.pyplot as plt
@@ -264 +277 @@
     plt.ylabel('residuals (P/P0)')
 
+@protect
 def _plot_result2D(data, theory, resid, view):
     """
@@ -290 +304 @@
     plt.colorbar()
 
+@protect
 def _plot_2d_signal(data, signal, vmin=None, vmax=None, view='log'):
     """