Changeset 4333

Timestamp:

Feb 28, 2020 4:19:30 AM (4 years ago)

Author:

vondreele

Message:

work on spot masking; change some text, menu names, etc.
Add menu item for Auto search for selected images.

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIpwd.py (modified) (2 diffs)

trunk/GSASIIdataGUI.py

@@ -5558 +5558 @@
         # IMG / Masks
         G2G.Define_wxId('wxID_MASKCOPY', 'wxID_MASKSAVE', 'wxID_MASKLOAD', 'wxID_NEWMASKSPOT', 'wxID_NEWMASKARC', 'wxID_NEWMASKRING',
-            'wxID_NEWMASKFRAME', 'wxID_NEWMASKPOLY','wxID_NEWMASKXLINE','wxID_NEWMASKYLINE','wxID_MASKLOADNOT', 'wxID_FINDSPOTS', 'wxID_DELETESPOTS',)
+            'wxID_NEWMASKFRAME', 'wxID_NEWMASKPOLY','wxID_NEWMASKXLINE','wxID_NEWMASKYLINE','wxID_MASKLOADNOT',
+            'wxID_FINDSPOTS', 'wxID_AUTOFINDSPOTS', 'wxID_DELETESPOTS',)
         self.MaskMenu = wx.MenuBar()
         self.PrefillDataMenu(self.MaskMenu)
@@ -5569 +5570 @@
         self.MaskEdit.Append(G2G.wxID_MASKLOADNOT,'Load mask','Load mask from file; ignoring threshold')
         self.MaskEdit.Append(G2G.wxID_MASKLOAD,'Load mask w/threshold','Load mask from file keeping the threshold value')
-        self.MaskEdit.Append(G2G.wxID_FINDSPOTS,'Auto spot masks','Auto search for spot masks; NB: will clear old spot masks')
+        self.MaskEdit.Append(G2G.wxID_FINDSPOTS,'Spot mask search','Search for spot mask; NB: slow')
+        self.MaskEdit.Append(G2G.wxID_AUTOFINDSPOTS,'Auto spot mask search','Auto spot mask ssearch; NB: slow')
         self.MaskEdit.Append(G2G.wxID_DELETESPOTS,'Delete spot masks','Delete all spot masks')
         submenu.Append(G2G.wxID_NEWMASKARC,'Arc mask','Create an arc mask with mouse input')

trunk/GSASIIimgGUI.py

@@ -1649 +1649 @@
             dlg.Destroy()
             
-    def OnAutoSpotMask(event):
+    def OnFindSpotMask(event):
         'Do auto search for spot masks'
-        if wx.MessageDialog(G2frame.dataWindow,'NB: This will clear any old spot masks',
-            'Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
-            Controls = copy.deepcopy(G2frame.GPXtree.GetItemPyData( 
-                G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Image Controls')))
+        if wx.MessageDialog(G2frame.dataWindow,'NB: This is slow (5-10min)',
+            'Spot mask search', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
+            Controls = G2frame.GPXtree.GetItemPyData( 
+                G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Image Controls'))
             wave = Controls['wavelength']
             LUtth = np.array(Controls['IOtth'])
@@ -1666 +1666 @@
             time0 = time.time()
             data['SpotMask']['spotMask'] = G2img.AutoSpotMask(G2frame.ImageZ,data,Controls,nChans,dlg)
-            print(' Autospot processing time: %.2f m'%((time.time()-time0)/60.))
+            print(' Spot masksearch time: %.2f m'%((time.time()-time0)/60.))
             wx.CallAfter(UpdateMasks,G2frame,data)
             wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)
+        else:
+            print(' Spot mask search not done')
+            
+    def OnAutoFindSpotMask(event):
+        Names = G2gd.GetGPXtreeDataNames(G2frame,['IMG ',])
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Automatic spot mask search','Select images to spot mask:',Names)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                items = dlg.GetSelections()
+                G2frame.EnablePlot = False
+                for item in items:
+                    name = Names[item]
+                    print ('Spot search for'+name)
+                    G2frame.Image = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name)
+                    Controls = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Image Controls'))
+                    Mask = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.Image,'Masks'))
+                    G2frame.ImageZ = GetImageZ(G2frame,Controls)
+                    wave = Controls['wavelength']
+                    LUtth = np.array(Controls['IOtth'])
+                    dsp0 = wave/(2.0*sind(LUtth[0]/2.0))
+                    dsp1 = wave/(2.0*sind(LUtth[1]/2.0))
+                    x0 = G2img.GetDetectorXY(dsp0,0.0,Controls)[0]
+                    x1 = G2img.GetDetectorXY(dsp1,0.0,Controls)[0]    
+                    nChans = int(1000*(x1-x0)/Controls['pixelSize'][0])//2
+                    dlg = wx.ProgressDialog("Spot mask search for %d bins"%nChans,"Processed 2-theta rings = ",nChans+3,
+                        style = wx.PD_ELAPSED_TIME|wx.PD_CAN_ABORT)
+                    time0 = time.time()
+                    Mask['SpotMask']['spotMask'] = G2img.AutoSpotMask(G2frame.ImageZ,Mask,Controls,nChans,dlg)
+                    print(' Spot mask search time: %.2f m'%((time.time()-time0)/60.))
+        finally:
+            dlg.Destroy()
+        G2plt.PlotExposedImage(G2frame,event=None)
+        
 
     def OnDeleteSpotMask(event):
@@ -1879 +1912 @@
     G2frame.Bind(wx.EVT_MENU, OnLoadMask, id=G2G.wxID_MASKLOADNOT)
     G2frame.Bind(wx.EVT_MENU, OnSaveMask, id=G2G.wxID_MASKSAVE)
-    G2frame.Bind(wx.EVT_MENU, OnAutoSpotMask, id=G2G.wxID_FINDSPOTS)
+    G2frame.Bind(wx.EVT_MENU, OnFindSpotMask, id=G2G.wxID_FINDSPOTS)
+    G2frame.Bind(wx.EVT_MENU, OnAutoFindSpotMask, id=G2G.wxID_AUTOFINDSPOTS)
     G2frame.Bind(wx.EVT_MENU, OnDeleteSpotMask, id=G2G.wxID_DELETESPOTS)
     G2frame.Bind(wx.EVT_MENU, ToggleSpotMaskMode, id=G2G.wxID_NEWMASKSPOT)

trunk/GSASIIpwd.py

@@ -388 +388 @@
     if 'XC' in inst['Type'][0]:
         ruland = Ruland(data['Ruland'],wave,Q,CF)
-#    auxPlot.append([Q,ruland,'Ruland'])      
+#        auxPlot.append([Q,ruland,'Ruland'])      
         CF *= ruland
 #    auxPlot.append([Q,CF,'CF-Corr'])
@@ -407 +407 @@
     mul = int(round(2.*np.pi*nR/(Rmax*qLimits[1])))
 #    mul = int(round(2.*np.pi*nR/(data.get('Rmax',100.)*qLimits[1])))
-    xydata['GofR'][1][0] = 2.*np.pi*np.linspace(0,nR,nR,endpoint=True)/(mul*qLimits[1])
-    xydata['GofR'][1][1] = -dq*np.imag(fft.fft(xydata['FofQ'][1][1],mul*nR)[:nR])
+    R = 2.*np.pi*np.linspace(0,nR,nR,endpoint=True)/(mul*qLimits[1])
+    xydata['GofR'][1][0] = R
+    GR = -dq*np.imag(fft.fft(xydata['FofQ'][1][1],mul*nR)[:nR])
+    xydata['GofR'][1][1] = GR
+#    gr = GR/(4.*np.pi*R)
+#    auxPlot.append([R,gr,'g(r)'])
     if data.get('noRing',True):
         xydata['GofR'][1][1] = np.where(xydata['GofR'][1][0]<0.5,0.,xydata['GofR'][1][1])