Changeset 013adb7 in sasmodels for sasmodels/data.py

Timestamp:

Dec 23, 2015 3:00:04 PM (8 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:

8b25ee1

Parents:

e21cc31

Message:

fix vlimits on 2D plots during parameter exploration

File:

• sasmodels/data.py (modified) (12 diffs)

sasmodels/data.py

@@ -220 +220 @@
 
 
-def plot_data(data, view='log'):
+def plot_data(data, view='log', limits=None):
     """
     Plot data loaded by the sasview loader.
@@ -228 +228 @@
     # do not repeat.
     if hasattr(data, 'lam'):
-        _plot_result_sesans(data, None, None, plot_data=True)
+        _plot_result_sesans(data, None, None, plot_data=True, limits=limits)
     elif hasattr(data, 'qx_data'):
-        _plot_result2D(data, None, None, view, plot_data=True)
-    else:
-        _plot_result1D(data, None, None, view, plot_data=True)
-
-
-def plot_theory(data, theory, resid=None, view='log', plot_data=True):
+        _plot_result2D(data, None, None, view, plot_data=True, limits=limits)
+    else:
+        _plot_result1D(data, None, None, view, plot_data=True, limits=limits)
+
+
+def plot_theory(data, theory, resid=None, view='log',
+                plot_data=True, limits=None):
     if hasattr(data, 'lam'):
-        _plot_result_sesans(data, theory, resid, plot_data=True)
+        _plot_result_sesans(data, theory, resid, plot_data=True, limits=limits)
     elif hasattr(data, 'qx_data'):
-        _plot_result2D(data, theory, resid, view, plot_data)
-    else:
-        _plot_result1D(data, theory, resid, view, plot_data)
+        _plot_result2D(data, theory, resid, view, plot_data, limits=limits)
+    else:
+        _plot_result1D(data, theory, resid, view, plot_data, limits=limits)
 
 
@@ -256 +257 @@
 
 @protect
-def _plot_result1D(data, theory, resid, view, plot_data):
+def _plot_result1D(data, theory, resid, view, plot_data, limits=None):
     """
     Plot the data and residuals for 1D data.
@@ -296 +297 @@
             some_present = some_present or (mtheory.count() > 0)
 
+        if limits is not None:
+            plt.ylim(*limits)
         plt.xscale('linear' if not some_present else view)
         plt.yscale('linear'
@@ -317 +320 @@
 
 @protect
-def _plot_result_sesans(data, theory, resid, plot_data):
+def _plot_result_sesans(data, theory, resid, plot_data, limits=None):
     import matplotlib.pyplot as plt
     if data.y is None:
@@ -331 +334 @@
         if theory is not None:
             plt.plot(data.x, theory, '-', hold=True)
+        if limits is not None:
+            plt.ylim(*limits)
         plt.xlabel('spin echo length (nm)')
         plt.ylabel('polarization (P/P0)')
@@ -344 +349 @@
 
 @protect
-def _plot_result2D(data, theory, resid, view, plot_data):
+def _plot_result2D(data, theory, resid, view, plot_data, limits=None):
     """
     Plot the data and residuals for 2D data.
@@ -355 +360 @@
 
     # Put theory and data on a common colormap scale
-    vmin, vmax = np.inf, -np.inf
-    if plot_data:
-        target = data.data[~data.mask]
-        datamin = target[target>0].min() if view == 'log' else target.min()
-        datamax = target.max()
-        vmin = min(vmin, datamin)
-        vmax = max(vmax, datamax)
-    if plot_theory:
-        theorymin = theory[theory>0].min() if view == 'log' else theory.min()
-        theorymax = theory.max()
-        vmin = min(vmin, theorymin)
-        vmax = max(vmax, theorymax)
+    if limits is None:
+        vmin, vmax = np.inf, -np.inf
+        if plot_data:
+            target = data.data[~data.mask]
+            datamin = target[target>0].min() if view == 'log' else target.min()
+            datamax = target.max()
+            vmin = min(vmin, datamin)
+            vmax = max(vmax, datamax)
+        if plot_theory:
+            theorymin = theory[theory>0].min() if view=='log' else theory.min()
+            theorymax = theory.max()
+            vmin = min(vmin, theorymin)
+            vmax = max(vmax, theorymax)
+    else:
+        vmin, vmax = limits
 
     if plot_data:
@@ -388 +396 @@
         plt.title('theory')
         h = plt.colorbar()
-        h.set_label('$I(q)$')
+        h.set_label(r'$\log_{10}I(q)$' if view=='log'
+                    else r'$q^4 I(q)$' if view == 'q4'
+                    else '$I(q)$')
 
     #if plot_data or plot_theory:
@@ -420 +430 @@
     if view == 'log':
         valid[valid] = (image[valid] > 0)
+        if vmin is None: vmin = image[valid & ~data.mask].min()
+        if vmax is None: vmax = image[valid & ~data.mask].max()
         image[valid] = np.log10(image[valid])
     elif view == 'q4':
         image[valid] *= (data.qx_data[valid]**2+data.qy_data[valid]**2)**2
+        if vmin is None: vmin = image[valid & ~data.mask].min()
+        if vmax is None: vmax = image[valid & ~data.mask].max()
+    else:
+        if vmin is None: vmin = image[valid & ~data.mask].min()
+        if vmax is None: vmax = image[valid & ~data.mask].max()
+
     image[~valid | data.mask] = 0
     #plottable = Iq
@@ -428 +446 @@
     xmin, xmax = min(data.qx_data)/10, max(data.qx_data)/10
     ymin, ymax = min(data.qy_data)/10, max(data.qy_data)/10
-    # TODO: fix vmin, vmax so it is shared for theory/resid
-    vmin = vmax = None
-    try:
-        if vmin is None: vmin = image[valid & ~data.mask].min()
-        if vmax is None: vmax = image[valid & ~data.mask].max()
-    except:
-        vmin, vmax = 0, 1
+    if view == 'log':
+        vmin, vmax = np.log10(vmin), np.log10(vmax)
     plt.imshow(plottable.reshape(len(data.x_bins), len(data.y_bins)),
                interpolation='nearest', aspect=1, origin='upper',
@@ -440 +453 @@
     plt.xlabel("$q_x$/nm$^{-1}$")
     plt.ylabel("$q_y$/nm$^{-1}$")
-
+    return vmin, vmax
 
 def demo():