Changeset 1933

Timestamp:

Jul 17, 2015 11:37:24 AM (8 years ago)

Author:

vondreele

Message:

remove old reflection style patches in G2phsGUI & G2plot
fix hkl & hklm tool tip display for powder data
fix drag of difference curve & hkl tic marks

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (12 diffs)
• GSASIIpwdGUI.py (modified) (9 diffs)

trunk/GSASIIphsGUI.py

@@ -102 +102 @@
                 reflSets = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
                 reflData = reflSets[phaseName]
-                if 'list' in str(type(reflData)):       #patch for old reflection data
-                    RefData = {'RefList':[],'FF':[]}
-                    for ref in reflDict:
-                        RefData['RefList'].append(ref[:11]+[ref[13],])
-                        RefData['FF'].append(ref[14])
-                    RefData['RefList'] = np.array(RefData['RefList'])
-                    reflData = RefData
             elif 'HKLF' in reflName:
                 PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root, reflName)

trunk/GSASIIplot.py

@@ -969 +969 @@
     plotting available.
     '''
-    global HKL
     global exclLines
     global DifLine
@@ -1147 +1146 @@
                         if pickIdText in ['Index Peak List','Unit Cells List',]:
                             indx = -2
-                        if len(HKL):
+                        if len(G2frame.HKL):
                             view = Page.toolbar._views.forward()[0][:2]
                             wid = view[1]-view[0]
-                            found = HKL[np.where(np.fabs(HKL.T[indx]-xpos) < 0.002*wid)]
+                            found = G2frame.HKL[np.where(np.fabs(G2frame.HKL.T[indx]-xpos) < 0.002*wid)]
                         if len(found):
                             if len(found[0]) > 6:   #SS reflections
@@ -1341 +1340 @@
             Pattern[0]['delOffset'] = -ypos/Ymax
             G2frame.itemPicked = None
-            G2frame.PatternTree.SetItemPyData(PickId,data)
             wx.CallAfter(PlotPatterns,G2frame,plotType=plottype)
             return
@@ -1369 +1367 @@
                 limits[1][0] = min(max(limits[0][0],limits[1][0]),limits[1][1])
                 limits[1][1] = max(min(limits[0][1],limits[1][1]),limits[1][0])
-                G2frame.PatternTree.SetItemPyData(LimitId,limits)
                 if G2frame.PatternTree.GetItemText(G2frame.PickId) == 'Limits':
                     G2pdG.UpdateLimitsGrid(G2frame,limits,plottype)
@@ -1385 +1382 @@
                         peaks['peaks'][lineNo-2][0] = xpos
                     peaks['sigDict'] = {}        #no longer valid
-                G2frame.PatternTree.SetItemPyData(PeakId,peaks)
                 G2pdG.UpdatePeakGrid(G2frame,peaks)
         elif G2frame.PatternTree.GetItemText(PickId) in ['Models',] and xpos:
@@ -1401 +1397 @@
                 data[1][0] = min(max(data[0][0],data[1][0]),data[1][1])
                 data[1][1] = max(min(data[0][1],data[1][1]),data[1][0])
-                G2frame.PatternTree.SetItemPyData(LimitId,data)        
         elif (G2frame.PatternTree.GetItemText(PickId) == 'Reflection Lists' or \
             'PWDR' in G2frame.PatternTree.GetItemText(PickId)) and xpos:
@@ -1413 +1408 @@
                 else:       #1st row of refl ticks
                     data[0]['refOffset'] = event.ydata
-                G2frame.PatternTree.SetItemPyData(PickId,data)
         PlotPatterns(G2frame,plotType=plottype)
         G2frame.itemPicked = None    
@@ -1522 +1516 @@
             item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)                
     lenX = 0
-    if PickId:
-        if G2frame.PatternTree.GetItemText(PickId) in ['Reflection Lists']:
-            Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
-            HKL = []
-            if Phases:  
-                try:
-                    for peak in Phases[G2frame.RefList]['RefList']:
-                        if len(peak) > 15:
-                            HKL.append(peak[:7])    #SS reflection list - need peak[:7]
-                        else:
-                            HKL.append(peak[:6])
-                except TypeError:   #old style patch
-                    for peak in Phases[G2frame.RefList]:
-                        HKL.append(peak[:6])                    
-                HKL = np.array(HKL)
-        else:
-            HKL = np.array(G2frame.HKL)
     Ymax = None
     for Pattern in PlotList:
@@ -1813 +1790 @@
             Phases = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
             for pId,phase in enumerate(Phases):
-                try:    #patch for old style reflection lists
-                    peaks = Phases[phase]['RefList']
-                except TypeError:
-                    peaks = Phases[phase]
+                peaks = Phases[phase]['RefList']
                 if not len(peaks):
                     continue
@@ -2426 +2400 @@
     ''' plotting of powder lines (i.e. no powder pattern) as sticks
     '''
-    global HKL
 
     def OnMotion(event):
@@ -2435 +2408 @@
             if G2frame.PickId and G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Index Peak List','Unit Cells List']:
                 found = []
-                if len(HKL):
+                if len(G2frame.HKL):
                     view = Page.toolbar._views.forward()[0][:2]
                     wid = view[1]-view[0]
-                    found = HKL[np.where(np.fabs(HKL.T[-1]-xpos) < 0.002*wid)]
+                    found = G2frame.HKL[np.where(np.fabs(G2frame.HKL.T[-1]-xpos) < 0.002*wid)]
                 if len(found):
                     h,k,l = found[0][:3] 
@@ -2465 +2438 @@
     for peak in peaks:
         Plot.axvline(peak[0],color='b')
-    HKL = np.array(G2frame.HKL)
     for hkl in G2frame.HKL:
         Plot.axvline(hkl[-1],color='r',dashes=(5,5))

trunk/GSASIIpwdGUI.py

@@ -2299 +2299 @@
                 maxH = ssopt['maxH']
                 G2frame.HKL = G2pwd.getHKLMpeak(dmin,Inst,SGData,SSGData,Vec,maxH,A)
+                G2frame.HKL = np.array(G2frame.HKL)
                 data[0] = G2indx.IndexSSPeaks(data[0],G2frame.HKL)[1]
             else:        #select cell from table - no SS
@@ -2308 +2309 @@
                         for hkl in G2frame.HKL:
                             hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3]))
+                        G2frame.HKL = np.array(G2frame.HKL)
                         data[0] = G2indx.IndexPeaks(data[0],G2frame.HKL)[1]
                         break
@@ -2598 +2600 @@
                 M20 = X20 = 0.
                 G2frame.HKL = G2pwd.getHKLpeak(dmin,SGData,A,Inst)
+        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))
@@ -2685 +2688 @@
             peaks = [G2indx.IndexPeaks(peaks[0],G2frame.HKL)[1],peaks[1]]   #put peak fit esds back in peaks
             Lhkl,M20,X20,Aref,Zero = G2indx.refinePeaksT(peaks[0],difC,ibrav,A,controls[1],controls[0])            
+        G2frame.HKL = np.array(G2frame.HKL)
         controls[1] = Zero
         controls[6:12] = G2lat.A2cell(Aref)
@@ -2708 +2712 @@
         for hkl in G2frame.HKL:
             hkl[ip] = G2lat.Dsp2pos(Inst,hkl[ip-1])+controls[1]
+        G2frame.HKL = np.array(G2frame.HKL)
         if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
             G2plt.PlotPowderLines(G2frame)
@@ -2755 +2760 @@
                 for hkl in G2frame.HKL:
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
+                G2frame.HKL = np.array(G2frame.HKL)
                 if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
                     G2plt.PlotPowderLines(G2frame)
@@ -2782 +2788 @@
                 for hkl in G2frame.HKL:
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
+                G2frame.HKL = np.array(G2frame.HKL)
                 if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
                     G2plt.PlotPowderLines(G2frame)
@@ -3030 +3037 @@
                 for hkl in G2frame.HKL:
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
+                G2frame.HKL = np.array(G2frame.HKL)
             table.append(row)
         UnitCellsTable = G2G.Table(table,rowLabels=rowLabels,colLabels=colLabels,types=Types)
@@ -3150 +3158 @@
             elif 'T' in Inst['Type'][0]:
                 refs = np.vstack((refList.T[:18+Super],I100)).T
-        for i in range(len(refs)): rowLabels.append(str(i))
+            G2frame.HKL = np.vstack((refList.T[:6+Super])).T    #build for plots
+        rowLabels = [str(i) for i in range(len(refs))]
         Types = (4+Super)*[wg.GRID_VALUE_LONG,]+4*[wg.GRID_VALUE_FLOAT+':10,4',]+ \
             2*[wg.GRID_VALUE_FLOAT+':10,2',]+[wg.GRID_VALUE_FLOAT+':10,3',]+ \