Changes in sasmodels/data.py [1a8c11c:d86f0fc] in sasmodels

File:

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

sasmodels/data.py

@@ -36 +36 @@
 
 import numpy as np  # type: ignore
-from numpy import sqrt, sin, cos, pi
 
 # pylint: disable=unused-import
@@ -302 +301 @@
 
 
-def empty_data1D(q, resolution=0.0, L=0., dL=0.):
+def empty_data1D(q, resolution=0.0):
     # type: (np.ndarray, float) -> Data1D
-    r"""
+    """
     Create empty 1D data using the given *q* as the x value.
 
-    rms *resolution* $\Delta q/q$ defaults to 0%.  If wavelength *L* and rms
-    wavelength divergence *dL* are defined, then *resolution* defines
-    rms $\Delta \theta/\theta$ for the lowest *q*, with $\theta$ derived from
-    $q = 4\pi/\lambda \sin(\theta)$.
+    *resolution* dq/q defaults to 5%.
     """
 
@@ -317 +313 @@
     Iq, dIq = None, None
     q = np.asarray(q)
-    if L != 0 and resolution != 0:
-        theta = np.arcsin(q*L/(4*pi))
-        dtheta = theta[0]*resolution
-        ## Solving Gaussian error propagation from
-        ##   Dq^2 = (dq/dL)^2 DL^2 + (dq/dtheta)^2 Dtheta^2
-        ## gives
-        ##   (Dq/q)^2 = (DL/L)**2 + (Dtheta/tan(theta))**2
-        ## Take the square root and multiply by q, giving
-        ##   Dq = (4*pi/L) * sqrt((sin(theta)*dL/L)**2 + (cos(theta)*dtheta)**2)
-        dq = (4*pi/L) * sqrt((sin(theta)*dL/L)**2 + (cos(theta)*dtheta)**2)
-    else:
-        dq = resolution * q
-
-    data = Data1D(q, Iq, dx=dq, dy=dIq)
+    data = Data1D(q, Iq, dx=resolution * q, dy=dIq)
     data.filename = "fake data"
     return data
@@ -503 +486 @@
             # Note: masks merge, so any masked theory points will stay masked,
             # and the data mask will be added to it.
-            #mtheory = masked_array(theory, data.mask.copy())
-            theory_x = data.x[~data.mask]
-            mtheory = masked_array(theory)
+            mtheory = masked_array(theory, data.mask.copy())
             mtheory[~np.isfinite(mtheory)] = masked
             if view is 'log':
                 mtheory[mtheory <= 0] = masked
-            plt.plot(theory_x, scale*mtheory, '-')
+            plt.plot(data.x, scale*mtheory, '-')
             all_positive = all_positive and (mtheory > 0).all()
             some_present = some_present or (mtheory.count() > 0)
@@ -545 +526 @@
 
     if use_resid:
-        theory_x = data.x[~data.mask]
-        mresid = masked_array(resid)
+        mresid = masked_array(resid, data.mask.copy())
         mresid[~np.isfinite(mresid)] = masked
         some_present = (mresid.count() > 0)
@@ -552 +532 @@
         if num_plots > 1:
             plt.subplot(1, num_plots, use_calc + 2)
-        plt.plot(theory_x, mresid, '.')
+        plt.plot(data.x, mresid, '.')
         plt.xlabel("$q$/A$^{-1}$")
         plt.ylabel('residuals')