Changeset 2604

Timestamp:

Dec 27, 2016 3:00:54 PM (6 years ago)

Author:

vondreele

Message:

a working auto spot mask finder - works if diffraction rings are smooth

Location:

trunk

Files:

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

trunk/GSASIIimage.py

@@ -1126 +1126 @@
     print 'auto spot search'
     pixelSize = Controls['pixelSize']
-    spotMask = ma.array(Image,mask=(Image<3.*np.mean(Image)))
+    spotMask = ma.array(Image,mask=(Image<np.mean(Image)))
     indices = (-1,0,1)
     rolls = np.array([[ix,iy] for ix in indices for iy in indices])
@@ -1132 +1132 @@
         if np.any(roll):        #avoid [0,0]
             spotMask = ma.array(spotMask,mask=(spotMask-rollImage(Image,roll)<=0.))
+    mags = spotMask[spotMask.nonzero()]
     indx = np.transpose(spotMask.nonzero())
-    peaks = indx*pixelSize/1000.
-    mags = spotMask[spotMask.nonzero()]
+    nx,ny = Image.shape
+    jndx = []
+    for [ind,mag] in zip(indx,mags):
+        if (0 < ind[0] < nx-1) and (0 < ind[1] < ny-1):
+            cent = np.zeros((3,3))
+            cent[1,1] = mag
+            msk = np.array(Image[ind[0]-1:ind[0]+2,ind[1]-1:ind[1]+2])
+            msk = msk-cent
+            if mag > 1.5*np.mean(msk):
+                jndx.append([ind[1]+.5,ind[0]+.5])
+    if len(jndx) > 100:
+        txt = 'Found: %d. Too many spots found; are rings spotty?'%(len(jndx))
+        return txt
+    jndx = np.array(jndx)
+    peaks = jndx*pixelSize/1000.
+    tth = GetTth(peaks.T[0],peaks.T[1],Controls)
+    histo = np.histogram(tth,2500)
+    Points = np.ones((peaks.shape[0],3))
+    Points[:,:2] = peaks
+    Masks['Points'] = Points
+    return None
                     
     

trunk/GSASIIimgGUI.py

@@ -1196 +1196 @@
         data[key] = data.get(key,[])
         l1 = len(data[key])
-        data[key] = [i for i in data[key] if i]
+        data[key] = [i for i in data[key] if len(i)]
         l2 = len(data[key])
         if GSASIIpath.GetConfigValue('debug') and l1 != l2:
@@ -1308 +1308 @@
         Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData( 
             G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))
-        G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
-        event.Skip()
+        Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
+        if not Error is None:
+            G2frame.ErrorDialog('Auto spot search error',Error)
+        wx.CallAfter(UpdateMasks,G2frame,data)
+        G2plt.PlotExposedImage(G2frame,event=event)                
             
     def ToggleSpotMaskMode(event):
@@ -1563 +1566 @@
     littleSizer.Add(upperThreshold,0,WACV)
     mainSizer.Add(littleSizer,0,)
-    if Spots:
+    if len(Spots):
         lbl = wx.StaticText(parent=G2frame.dataDisplay,label=' Spot masks')
         lbl.SetBackgroundColour(wx.Colour(200,200,210))
@@ -1572 +1575 @@
         littleSizer.Add((5,0),0)
         for i in range(len(Spots)):
-            if Spots[i]:
+            if len(Spots[i]):
                 x,y,d = Spots[i]
                 spotText = wx.TextCtrl(parent=G2frame.dataDisplay,value=("%.2f,%.2f" % (x,y)),

trunk/GSASIIplot.py

@@ -4938 +4938 @@
         if 'Frames' not in Masks: Masks['Frames'] = []  # patch
         for i,spot in enumerate(Masks['Points']):   # drawing spot masks
-            if spot:
+            if len(spot):
                 x,y,d = spot
                 artist = Circle((x,y),radius=d/2,fc='none',ec='r',picker=3)