Changeset 3248

Timestamp:

Jan 29, 2018 4:13:35 PM (5 years ago)

Author:

vondreele

Message:

fix powder peaks input/display/indexing
fix issue with hkl display on indexed powder patterns

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (6 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIdataGUI.py

@@ -7433 +7433 @@
             G2plt.PlotImage(G2frame,newPlot=True)
         elif G2frame.GPXtree.GetItemText(item).startswith('PKS '):
+            G2frame.PatternId = item
             G2plt.PlotPowderLines(G2frame)
         elif G2frame.GPXtree.GetItemText(item).startswith('PWDR '):

trunk/GSASIIplot.py

@@ -1317 +1317 @@
     global DifLine # BHT: probably does not need to be global
     global Ymax
-    global Pattern,mcolors
+    global Pattern,mcolors,Plot
     plottype = plotType
     
@@ -1535 +1535 @@
                             indx = -2
                         if len(G2frame.HKL):
-                            view = Page.toolbar._views.forward()[0][:2]
-                            wid = view[1]-view[0]
+                            limx = Plot.get_xlim()
+                            wid = limx[1]-limx[0]
                             found = G2frame.HKL[np.where(np.fabs(G2frame.HKL.T[indx]-xpos) < 0.002*wid)]
                         if len(found):
@@ -2898 +2898 @@
     '''plot of CW or TOF peak calibration
     '''
+    
+    global Plot
     def OnMotion(event):
         xpos = event.xdata
@@ -2908 +2910 @@
                 G2frame.G2plotNB.status.SetStatusText('Select '+Title+' pattern first',1)
             found = []
-            wid = 1
-            view = Page.toolbar._views.forward()
-            if view:
-                view = view[0][:2]
-                wid = view[1]-view[0]
+            xlim = Plot.get_xlim()
+            wid = xlim[1]-xlim[0]
             found = XY[np.where(np.fabs(XY.T[0]-xpos) < 0.005*wid)]
             if len(found):
@@ -3397 +3396 @@
     ''' plotting of powder lines (i.e. no powder pattern) as sticks
     '''
-
+    global Plot
     def OnMotion(event):
         xpos = event.xdata
@@ -3406 +3405 @@
                 found = []
                 if len(G2frame.HKL):
-                    view = Page.toolbar._views.forward()[0][:2]
-                    wid = view[1]-view[0]
+                    xlim = Plot.get_xlim()
+                    wid = xlim[1]-xlim[0]
                     found = G2frame.HKL[np.where(np.fabs(G2frame.HKL.T[-1]-xpos) < 0.002*wid)]
                 if len(found):

trunk/GSASIIpwdGUI.py

@@ -2933 +2933 @@
         spc = controls[13]
         SGData = G2spc.SpcGroup(spc)[1]
+        Symb = SGData['SpGrp']
         if ssopt.get('Use',False):
             SSGData = G2spc.SSpcGroup(SGData,ssopt['ssSymb'])[1]
+            Symb = SSGData['SSpGrp']
             Vec = ssopt['ModVec']
             maxH = ssopt['maxH']
@@ -2951 +2953 @@
         G2frame.HKL = np.array(G2frame.HKL)
         if len(G2frame.HKL):
-            print (' new M20,X20: %.2f %d fraction found: %.3f'%(M20,X20,float(len(peaks[0]))/len(G2frame.HKL)))
+            print (' new M20,X20: %.2f %d, fraction found: %.3f for %s'  \
+                %(M20,X20,float(len(peaks[0]))/len(G2frame.HKL),Symb))
         G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Index Peak List'),peaks)
         if 'PKS' in G2frame.GPXtree.GetItemText(G2frame.PatternId):