Changeset 3444

Timestamp:

Jun 20, 2018 9:35:13 AM (5 years ago)

Author:

vondreele

Message:

fix problem of masked xdata values as limits to linspace for background functions & derivatives; use the data instead of the masked data

File:

• trunk/GSASIIpwd.py (modified) (2 diffs)

trunk/GSASIIpwd.py

@@ -757 +757 @@
             yb = parmDict[pfx+'Back;0']*T1+parmDict[pfx+'Back;1']*T2
         else:
+            xnomask = ma.getdata(xdata)
+            xmin,xmax = xnomask[0],xnomask[-1]
             if bakType == 'lin interpolate':
-                bakPos = np.linspace(xdata[0],xdata[-1],nBak,True)
+                bakPos = np.linspace(xmin,xmax,nBak,True)
             elif bakType == 'inv interpolate':
-                bakPos = 1./np.linspace(1./xdata[-1],1./xdata[0],nBak,True)
+                bakPos = 1./np.linspace(1./xmax,1./xmin,nBak,True)
             elif bakType == 'log interpolate':
-                bakPos = np.exp(np.linspace(np.log(xdata[0]),np.log(xdata[-1]),nBak,True))
-            bakPos[0] = xdata[0]
-            bakPos[-1] = xdata[-1]
+                bakPos = np.exp(np.linspace(np.log(xmin),np.log(xmax),nBak,True))
+            bakPos[0] = xmin
+            bakPos[-1] = xmax
             bakVals = np.zeros(nBak)
             for i in range(nBak):
@@ -875 +877 @@
             dydb = [T1,T2]
         else:
+            xnomask = ma.getdata(xdata)
+            xmin,xmax = xnomask[0],xnomask[-1]
             if bakType == 'lin interpolate':
-                bakPos = np.linspace(xdata[0],xdata[-1],nBak,True)
+                bakPos = np.linspace(xmin,xmax,nBak,True)
             elif bakType == 'inv interpolate':
-                bakPos = 1./np.linspace(1./xdata[-1],1./xdata[0],nBak,True)
+                bakPos = 1./np.linspace(1./xmax,1./xmin,nBak,True)
             elif bakType == 'log interpolate':
-                bakPos = np.exp(np.linspace(np.log(xdata[0]),np.log(xdata[-1]),nBak,True))
-            bakPos[0] = xdata[0]
-            bakPos[-1] = xdata[-1]
+                bakPos = np.exp(np.linspace(np.log(xmin),np.log(xmax),nBak,True))
+            bakPos[0] = xmin
+            bakPos[-1] = xmax
             for i,pos in enumerate(bakPos):
                 if i == 0: