Changeset b89f519 in sasmodels for sasmodels/bumps_model.py

Timestamp:

Mar 4, 2015 2:34:25 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:

3c56da87

Parents:

12c810f

Message:

allow q^{4 plots in compare; choose random values within a factor of 2 of the model value for compare -random}

File:

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

sasmodels/bumps_model.py

@@ -154 +154 @@
 
 
-def plot_data(data, iq, vmin=None, vmax=None, scale='log'):
+def plot_data(data, iq, vmin=None, vmax=None, view='log'):
     """
     Plot the target value for the data.  This could be the data itself,
@@ -166 +166 @@
         iq = iq + 0
         valid = np.isfinite(iq)
-        if scale == 'log':
+        if view == 'log':
             valid[valid] = (iq[valid] > 0)
             iq[valid] = np.log10(iq[valid])
+        elif view == 'q4':
+            iq[valid] = iq*(data.qx_data[valid]**2+data.qy_data[valid]**2)**2
         iq[~valid | data.mask] = 0
         #plottable = iq
@@ -183 +185 @@
                    extent=[xmin, xmax, ymin, ymax], vmin=vmin, vmax=vmax)
     else: # 1D data
-        if scale == 'linear':
+        if view == 'linear' or view == 'q4':
+            #idx = np.isfinite(iq)
+            scale = data.x**4 if view == 'q4' else 1.0
+            plt.plot(data.x, scale*iq) #, '.')
+        else:
+            # Find the values that are finite and positive
             idx = np.isfinite(iq)
-            plt.plot(data.x[idx], iq[idx])
-        else:
-            idx = np.isfinite(iq)
-            idx[idx] = (iq[idx] > 0)
-            plt.loglog(data.x[idx], iq[idx])
+            idx[idx] = iq[idx]>0
+            iq[~idx] = np.nan
+            plt.loglog(data.x, iq)
 
 
@@ -207 +212 @@
     mresid = masked_array((theory - data.y) / data.dy, mdata.mask)
 
+    scale = data.x**4 if view == 'q4' else 1.0
     plt.subplot(121)
-    plt.errorbar(data.x, mdata, yerr=data.dy)
-    plt.plot(data.x, mtheory, '-', hold=True)
-    plt.yscale(view)
+    plt.errorbar(data.x, scale*mdata, yerr=data.dy)
+    plt.plot(data.x, scale*mtheory, '-', hold=True)
+    plt.yscale('linear' if view == 'q4' else view)
     plt.subplot(122)
     plt.plot(data.x, mresid, 'x')
@@ -234 +240 @@
     resid = (theory - data.data) / data.err_data
     plt.subplot(131)
-    plot_data(data, data.data, scale=view)
+    plot_data(data, data.data, view=view)
     plt.colorbar()
     plt.subplot(132)
-    plot_data(data, theory, scale=view)
+    plot_data(data, theory, view=view)
     plt.colorbar()
     plt.subplot(133)
-    plot_data(data, resid, scale='linear')
+    plot_data(data, resid, view='linear')
     plt.colorbar()