Changeset 4317 for trunk/GSASIIimgGUI.py

Timestamp:

Feb 17, 2020 10:05:27 AM (3 years ago)

Author:

vondreele

Message:

make esd multiplier for spot mask search a float
add timing to it

File:

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

trunk/GSASIIimgGUI.py

@@ -1639 +1639 @@
             if dlg.ShowModal() == wx.ID_OK:
                 filename = dlg.GetPath()
+                
                 G2fil.readMasks(filename,data,ignoreThreshold)
                 wx.CallAfter(UpdateMasks,G2frame,data)
@@ -1660 +1661 @@
             dlg = wx.ProgressDialog("Auto spot masking for %d bins"%nChans,"Processed 2-theta rings = ",nChans+1,
                 style = wx.PD_ELAPSED_TIME|wx.PD_CAN_ABORT)
+            time0 = time.time()
             Error = G2img.AutoSpotMasks2(G2frame.ImageZ,data,Controls,nChans,dlg)
+            print(' Autospot processing time: %.2f'%(time.time()-time0))
             if not Error is None:
                 G2frame.ErrorDialog('Auto spot search error',Error)
@@ -1860 +1863 @@
     
     def OnDelBtn(event):
-        data['SpotMask'] = {'esdMul':2,'spotMask':None}
+        data['SpotMask'] = {'esdMul':2.,'spotMask':None}
         wx.CallAfter(UpdateMasks,G2frame,data)
                 
@@ -1914 +1917 @@
         data['Frames'] = []
     if 'SpotMask' not in data:
-        data['SpotMask'] = {'esdMul':2,'spotMask':None}
+        data['SpotMask'] = {'esdMul':2.,'spotMask':None}
     frame = data['Frames']             #3+ x,y pairs
     Arcs = data['Arcs']                 #radius, start/end azimuth, thickness
@@ -1942 +1945 @@
     mainSizer.Add(littleSizer,0,)
     spotSizer = wx.BoxSizer(wx.HORIZONTAL)
+    data['SpotMask']['esdMul'] = float(data['SpotMask']['esdMul'])
     spotSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Select spot range factor (1-10): '),0,WACV)
     spotSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,loc=data['SpotMask'],
@@ -3200 +3204 @@
         else:
             self.ImageMasks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Frames':[],
-                                     'SpotMask':{'esdMul':2,'spotMask':None},
-                                   }
+                'SpotMask':{'esdMul':2.,'spotMask':None},}
         
     def StartLoop(self):