Changeset 5d4777d in sasmodels for sasmodels/bumps_model.py

Timestamp:

Sep 2, 2014 1:24:38 AM (10 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:

f4cf580

Parents:

ff7119b

Message:

reorganize, check and update models

File:

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

sasmodels/bumps_model.py

@@ -140 +140 @@
     import matplotlib.pyplot as plt
     if hasattr(data, 'qx_data'):
-        img = masked_array(iq, data.mask)
+        iq = iq[:]
+        valid = np.isfinite(iq)
         if scale == 'log':
-            img[(img <= 0) | ~np.isfinite(img)] = masked
-            img = np.log10(img)
+            valid[valid] = (iq[valid] > 0)
+            iq[valid] = np.log10(iq[valid])
+        iq[~valid|data.mask] = 0
+        #plottable = iq
+        plottable = masked_array(iq, ~valid|data.mask)
         xmin, xmax = min(data.qx_data), max(data.qx_data)
         ymin, ymax = min(data.qy_data), max(data.qy_data)
-        plt.imshow(img.reshape(128,128),
+        plt.imshow(plottable.reshape(128,128),
                    interpolation='nearest', aspect=1, origin='upper',
                    extent=[xmin, xmax, ymin, ymax], vmin=vmin, vmax=vmax)
@@ -154 +158 @@
             plt.plot(data.x[idx], iq[idx])
         else:
-            idx = np.isfinite(iq) & (iq>0)
+            idx = np.isfinite(iq)
+            idx[idx] = (iq[idx]>0)
             plt.loglog(data.x[idx], iq[idx])
 
@@ -228 +233 @@
     def __init__(self, data, model, cutoff=1e-5, **kw):
         from bumps.names import Parameter
+        partype = model.info['partype']
 
         # interpret data
@@ -236 +242 @@
             self.diq = data.err_data[self.index]
             self._theory = np.zeros_like(data.data)
-            q_vectors = [data.qx_data, data.qy_data]
+            if not partype['orientation'] and not partype['magnetic']:
+                q_vectors = [np.sqrt(data.qx_data**2+data.qy_data**2)]
+            else:
+                q_vectors = [data.qx_data, data.qy_data]
         else:
             self.index = (data.x>=data.qmin) & (data.x<=data.qmax) & ~np.isnan(data.y)
@@ -258 +267 @@
             setattr(self, name, Parameter.default(value, name=name, limits=limits))
             pars.append(name)
-        for name in model.info['partype']['pd-2d']:
+        for name in partype['pd-2d']:
             for xpart,xdefault,xlimits in [
                     ('_pd', 0, limits),