Changeset 2613

Timestamp:

Jan 6, 2017 9:34:29 AM (5 years ago)

Author:

vondreele

Message:

auto spot mask work

File:

• trunk/GSASIIimage.py (modified) (3 diffs)

trunk/GSASIIimage.py

@@ -30 +30 @@
 import GSASIIpwd as G2pwd
 import GSASIIspc as G2spc
+import GSASIImath as G2mth
 
 # trig functions in degrees
@@ -1141 +1142 @@
             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):
+            msk = ma.array(msk,mask=(msk==mag))
+            if mag > 1.33*ma.mean(msk):
                 jndx.append([ind[1]+.5,ind[0]+.5])
+    print 'Spots found: ',len(jndx)
     if len(jndx) > 100:
         txt = 'Found: %d. Too many spots found; are rings spotty?'%(len(jndx))
@@ -1150 +1152 @@
     peaks = jndx*pixelSize/1000.
     tth = GetTth(peaks.T[0],peaks.T[1],Controls)
-    histo = np.histogram(tth,2500)
+    Peakarray = np.vstack((tth,peaks.T)).T
+    Peakarray = np.array(G2mth.sortArray(Peakarray,0))  #now in 2theta order
     Points = np.ones((peaks.shape[0],3))
-    Points[:,:2] = peaks
+    Points[:,:2] = Peakarray[:,1:]
     Masks['Points'] = Points
     return None