Changeset 4299 for trunk/GSASIIimgGUI.py

Timestamp:

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

Author:

vondreele

Message:

new spot mask algorithm - it is slow but works

File:

• trunk/GSASIIimgGUI.py (modified) (5 diffs)

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)')