remove broken stride check from fmask; replace deprecated numpy routines

Author: briantoby

GSASII/GSASIIimage.py

@@ -786,8 +786,8 @@ def EdgeFinder(image,data):
     scalex = pixelSize[0]/1000.
     scaley = pixelSize[1]/1000.
     tay,tax = np.mgrid[0:Nx,0:Ny]
-    tax = np.asfarray(tax*scalex,dtype=np.float32)
-    tay = np.asfarray(tay*scaley,dtype=np.float32)
+    tax = np.asarray(tax*scalex,dtype=np.float32)
+    tay = np.asarray(tay*scaley,dtype=np.float32)
     tam = ma.getmask(ma.masked_less(image.flatten(),edgemin))
     tax = ma.compressed(ma.array(tax.flatten(),mask=tam))
     tay = ma.compressed(ma.array(tay.flatten(),mask=tam))
@@ -1238,8 +1238,8 @@ def Make2ThetaAzimuthMap(data,iLim,jLim): #most expensive part of integration!
     scalex = pixelSize[0]/1000.
     scaley = pixelSize[1]/1000.
     tay,tax = np.mgrid[iLim[0]+0.5:iLim[1]+.5,jLim[0]+.5:jLim[1]+.5]         #bin centers not corners
-    tax = np.asfarray(tax*scalex,dtype=np.float32).flatten()
-    tay = np.asfarray(tay*scaley,dtype=np.float32).flatten()
+    tax = np.asarray(tax*scalex,dtype=np.float32).flatten()
+    tay = np.asarray(tay*scaley,dtype=np.float32).flatten()
     nI = iLim[1]-iLim[0]
     nJ = jLim[1]-jLim[0]
     TA = np.empty((4,nI,nJ))
@@ -1325,8 +1325,8 @@ def MakeMaskMap(data,masks,iLim,jLim):
         else:
             masks['Pmask'] =  []
     tay,tax = np.mgrid[iLim[0]+0.5:iLim[1]+.5,jLim[0]+.5:jLim[1]+.5]         #bin centers not corners
-    tax = np.asfarray(tax*scalex,dtype=np.float32).flatten()
-    tay = np.asfarray(tay*scaley,dtype=np.float32).flatten()
+    tax = np.asarray(tax*scalex,dtype=np.float32).flatten()
+    tay = np.asarray(tay*scaley,dtype=np.float32).flatten()
     nI = iLim[1]-iLim[0]
     nJ = jLim[1]-jLim[0]
     #make position masks here

sources/fmask.c

@@ -132,23 +132,18 @@ static PyObject *fmask_func(PyObject *self, PyObject *args) {
 
   /* Sanity checks on function arguments */
   if (PyArray_DESCR(frame)->type_num != NPY_BOOL ||
-      PyArray_STRIDE(frame, 0) != PyArray_ITEMSIZE(frame) ||
       PyArray_NDIM(frame) != 1)
     return makeTypeException("Arg 1 (frame): expected 1-dimensional array of type bool w/stride 1.");
   if (PyArray_DESCR(TA)->type_num != NPY_DOUBLE ||
-      PyArray_STRIDE(TA, 0) != PyArray_ITEMSIZE(TA) ||
       PyArray_NDIM(TA) != 1)
     return makeTypeException("Arg 2 (TA): expected 1-dimensional array of type np.float64 w/stride 1.");
   if (PyArray_DESCR(image)->type_num != NPY_INT32 ||
-      PyArray_STRIDE(image, 0) != PyArray_ITEMSIZE(image) ||
       PyArray_NDIM(image) != 1)
     return makeTypeException("Arg 3 (image): expected 1-dimensional array of type np.float64 w/stride 1.");
   if (PyArray_DESCR(TThs)->type_num != NPY_DOUBLE ||
-      PyArray_STRIDE(TThs, 0) != PyArray_ITEMSIZE(TThs) ||
       PyArray_NDIM(TThs) != 1)
     return makeTypeException("Arg 4 (TThs): expected 1-dimensional array of type np.float64 w/stride 1.");
   if (PyArray_DESCR(outMask)->type_num != NPY_BOOL ||
-      PyArray_STRIDE(outMask, 0) != PyArray_ITEMSIZE(outMask) ||
       PyArray_NDIM(outMask) != 1)
     return makeTypeException("Arg 3 (outMask): expected 1-dimensional array of type bool w/stride 1.");
   // special tests for the output array