Changeset 2620

Timestamp:

Jan 11, 2017 11:20:01 AM (6 years ago)

Author:

vondreele

Message:

allow multipanel Phase data window change G2ctrls - GSNotebook init
put in try/except to catch C++ errors when GSAS-II started via gpx file double click (Windows)
more tweaks of image Auto spot find - now avoids spots in Bragg rings

Location:

trunk

Files:

• GSASIIctrls.py (modified) (1 diff)
• GSASIIgrid.py (modified) (5 diffs)
• GSASIIimage.py (modified) (4 diffs)

trunk/GSASIIctrls.py

@@ -3004 +3004 @@
     '''Notebook used in various locations; implemented with wx.aui extension
     '''
-    def __init__(self, parent, name='',size = None):
-        wx.aui.AuiNotebook.__init__(self, parent, -1,
-                                    style=wx.aui.AUI_NB_TOP |
-                                    wx.aui.AUI_NB_SCROLL_BUTTONS)
+    def __init__(self, parent, name='',size = None,style=wx.aui.AUI_NB_TOP |
+        wx.aui.AUI_NB_SCROLL_BUTTONS):
+        wx.aui.AuiNotebook.__init__(self, parent, style=style)
         if size: self.SetSize(size)
         self.parent = parent

trunk/GSASIIgrid.py

@@ -2512 +2512 @@
         self.lastSize = [0,0]        
         self.manualPhaseSize = None
+        self.userReSize = False
         wx.Frame.Bind(self,wx.EVT_SIZE,self.OnReSize)
-        self.userReSize = False
             
     def OnReSize(self,event):
@@ -2519 +2519 @@
         '''
         id = self.G2frame.PatternTree.GetSelection()
-        parent = self.G2frame.PatternTree.GetItemParent(id)
+        try:
+            parent = self.G2frame.PatternTree.GetItemParent(id)
+        except:         #avoid bad tree item on start via gpx file selection 
+            parent = 0
         if self.userReSize and parent and self.G2frame.PatternTree.GetItemText(parent) == "Phases": 
             self.manualPhaseSize = event.EventObject.GetSize()
@@ -2539 +2542 @@
         Width = list(Width)
         id = self.G2frame.PatternTree.GetSelection()
-        pid = self.G2frame.PatternTree.GetItemParent(id)
+        try:            #avoid bad tree item on start via gpx file selection 
+            pid = self.G2frame.PatternTree.GetItemParent(id)
+        except:
+            pid = 0
         if pid:
             parent = self.G2frame.PatternTree.GetItemText(pid)
@@ -2835 +2841 @@
     mainSizer.Layout()    
     G2frame.dataDisplay.SetSizer(mainSizer)
-    #G2frame.dataDisplay.SetSize(mainSizer.Fit(G2frame.dataFrame))
     G2frame.dataFrame.setSizePosLeft(mainSizer.Fit(G2frame.dataFrame))
      
@@ -4011 +4016 @@
     G2frame.dataDisplay.AutoSizeColumns(True)
     if prevSize:
-        #G2frame.dataDisplay.SetSize(prevSize)
         G2frame.dataFrame.setSizePosLeft(prevSize)
     else:

trunk/GSASIIimage.py

@@ -23 +23 @@
 import polymask as pm
 from scipy.optimize import leastsq
+import scipy.signal as scsg
 import copy
 import GSASIIpath
@@ -1132 +1133 @@
     for roll in rolls:
         if np.any(roll):        #avoid [0,0]
-            spotMask = ma.array(spotMask,mask=(spotMask-rollImage(Image,roll)<=0.10*np.mean(Image)))
+            spotMask = ma.array(spotMask,mask=(spotMask-rollImage(Image,roll)<0.))
     mags = spotMask[spotMask.nonzero()]
     indx = np.transpose(spotMask.nonzero())
@@ -1138 +1139 @@
     jndx = []
     for [ind,mag] in zip(indx,mags):
-        if (0 < ind[0] < nx-1) and (0 < ind[1] < ny-1):
+        if (1 < ind[0] < nx-2) and (1 < ind[1] < ny-2):
             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 = np.array(Image[ind[0]-2:ind[0]+3,ind[1]-2:ind[1]+3])
             msk = ma.array(msk,mask=(msk==mag))
-            if mag > 1.33*ma.mean(msk):
+            if mag > 1.5*ma.mean(msk):
                 jndx.append([ind[1]+.5,ind[0]+.5])
     print 'Spots found: ',len(jndx)
@@ -1149 +1150 @@
     peaks = jndx*pixelSize/1000.
     tth = GetTth(peaks.T[0],peaks.T[1],Controls)
-    histtth,bins = np.histogram(tth,2500)
-    
+    histth,bins = np.histogram(tth,2500)
+    for shft in [-1,1]:
+        histmsk = ma.array(histth,mask=-(histth-np.roll(histth,shft)<2.))
+    histmsk = ma.array(histmsk,mask=(histmsk>5))
+    binmsk = np.array(ma.nonzero(histmsk))
+    digts = np.digitize(tth,bins)-1
+    PeaksList = []
+    for digt,peak in zip(digts,peaks):
+        if digt in binmsk:
+            PeaksList.append(peak)
     #should be able to filter out spotty Bragg rings here
-    Peakarray = np.vstack((tth,peaks.T)).T
-    Peakarray = np.array(G2mth.sortArray(Peakarray,0))  #now in 2theta 
-    if peaks.shape[0] > 100:
-        txt = 'More than 100 spots found: %d. Are rings spotty?'%(len(jndx))
-        return txt
-    Points = np.ones((peaks.shape[0],3))
-    Points[:,:2] = Peakarray[:,1:]
+    PeaksList = np.array(PeaksList)
+#    Peakarray = np.vstack((tth,peaks.T)).T
+#    Peakarray = np.array(G2mth.sortArray(Peakarray,0))  #now in 2theta 
+#    if peaks.shape[0] > 100:
+#        txt = 'More than 100 spots found: %d. Are rings spotty?'%(len(jndx))
+#        return txt
+    Points = np.ones((PeaksList.shape[0],3))
+#    Points[:,:2] = Peakarray[:,1:]
+    Points[:,:2] = PeaksList
     Masks['Points'] = list(Points)
     return None