Changeset 4316

Timestamp:

Feb 17, 2020 7:30:29 AM (4 years ago)

Author:

vondreele

Message:

slight streamline of AutoSpotMask2 - a bit faster

File:

• trunk/GSASIIimage.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1524 +1524 @@
     dtth = (LUtth[1]-LUtth[0])/numChans
     esdMul = Masks['SpotMask']['esdMul']
-    mask = ma.make_mask_none(Image.shape)    
+    mask = ma.make_mask_none(Image.shape)
+    band = ma.array(Image,mask=ma.nomask)
     TA = Make2ThetaAzimuthMap(Controls,(0,Image.shape[0]),(0,Image.shape[1]))[0]    #2-theta array
     TThs = np.linspace(LUtth[0],LUtth[1],numChans,False)
     for it,TTh in enumerate(TThs):
-        band = ma.array(Image,mask=ma.getmask(ma.masked_outside(TA,TTh,TTh+dtth)))
+        band.mask = ma.masked_outside(TA,TTh,TTh+dtth).mask
         std = ma.std(band)
         anom = band.anom()/std
         anom = ma.masked_greater(anom,esdMul,copy=False)
-        mask ^= (ma.getmask(anom)^ma.getmask(band))
+        mask ^= (anom.mask^band.mask)
         if not dlg is None:
             GoOn = dlg.Update(it,newmsg='Processed 2-theta rings = %d'%(it))