Changeset 4299

Timestamp:

Feb 13, 2020 9:56:45 AM (3 years ago)

Author:

vondreele

Message:

new spot mask algorithm - it is slow but works

Location:

trunk

Files:

• GSASIIimage.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (5 diffs)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -1188 +1188 @@
 
             t0 = time.time()
-            Block = image[iBeg:iFin,jBeg:jFin]
+            Block = image[iBeg:iFin,jBeg:jFin]          #apply image spotmask here
             tax,tay,taz,tad,tabs = Fill2ThetaAzimuthMap(Masks,TA,tam,Block)    #and apply masks
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
@@ -1518 +1518 @@
     Masks['Points'] = Peaks
     return None
+
+def AutoSpotMasks2(Image,Masks,Controls,dlg=None):
+    
+    LUtth = np.array(Controls['IOtth'])
+    numChans = Controls['outChannels']
+    dtth = (LUtth[1]-LUtth[0])/numChans
+    esdMul = Masks['SpotMask']['esdMul']
+    mask = ma.make_mask_none(Image.shape)    
+    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)))
+        std = ma.std(band)
+        anom = band.anom()/std
+        anom = ma.masked_greater(anom,esdMul,copy=False)
+        mask ^= (ma.getmask(anom)^ma.getmask(band))
+        if not dlg is None:
+            GoOn = dlg.Update(it,newmsg='Processed 2-theta rings = %d'%(it))
+            if not GoOn[0]:
+                break
+    Masks['SpotMask']['spotMask'] = mask
+    return None

trunk/GSASIIimgGUI.py

@@ -28 +28 @@
 import matplotlib as mpl
 import numpy as np
+import numpy.ma as ma
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision$")
@@ -1644 +1645 @@
             Controls = copy.deepcopy(G2frame.GPXtree.GetItemPyData( 
                 G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Image Controls')))
-            Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
+            nChans = Controls['outChannels']
+            dlg = wx.ProgressDialog("Auto spot masking","Processed 2-theta rings = ",nChans+1,
+                style = wx.PD_ELAPSED_TIME|wx.PD_CAN_ABORT)
+            Error = G2img.AutoSpotMasks2(G2frame.ImageZ,data,Controls,dlg)
             if not Error is None:
                 G2frame.ErrorDialog('Auto spot search error',Error)
@@ -1842 +1846 @@
         maxSizer.Add(autoSizer)
         return maxSizer
-
+    
+    def OnDelBtn(event):
+        data['SpotMask'] = {'esdMul':2,'spotMask':None}
+        wx.CallAfter(UpdateMasks,G2frame,data)
+                
+    
     G2frame.dataWindow.ClearData()
     startScroll = None
@@ -1891 +1900 @@
     if 'Frames' not in data:
         data['Frames'] = []
+    if 'SpotMask' not in data:
+        data['SpotMask'] = {'esdMul':2,'spotMask':None}
     frame = data['Frames']             #3+ x,y pairs
     Arcs = data['Arcs']                 #radius, start/end azimuth, thickness
@@ -1917 +1928 @@
     littleSizer.Add(upperThreshold,0,WACV)
     mainSizer.Add(littleSizer,0,)
+    spotSizer = wx.BoxSizer(wx.HORIZONTAL)
+    spotSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Select spot range factor (1-10): '),0,WACV)
+    spotSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,loc=data['SpotMask'],
+        key='esdMul',min=1,max=10,size=(40,25)),0,WACV)
+    numPix = 0
+    if data['SpotMask']['spotMask'] is not None:
+        numPix = np.count_nonzero(data['SpotMask']['spotMask'])
+    spotSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Number of pixels in spot mask: %d  '%numPix),0,WACV)
+    delbtn = wx.Button(G2frame.dataWindow,label='Clear spot mask')
+    delbtn.Bind(wx.EVT_BUTTON,OnDelBtn)
+    spotSizer.Add(delbtn,0,WACV)
+    mainSizer.Add(spotSizer,0,WACV)
     if len(Spots):
         lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Spot masks(on plot LB drag to move, shift-LB drag to resize, RB to delete)')

trunk/GSASIIplot.py

@@ -7674 +7674 @@
         if newImage:
             Imin,Imax = Data['range'][1]
-            MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]),Zlim[1])            
-            MaskA = ma.getmaskarray(MA)
+            MA = ma.masked_outside(G2frame.ImageZ,Zlim[0],Zlim[1])
+            MaskA = ma.getmaskarray(MA)^Masks['SpotMask']['spotMask']
+            MA = ma.array(MA,mask=MaskA)
             for xline in Masks.get('Xlines',[]):
                 MaskA[xline,:] = True