Changeset 1586

Timestamp:

Nov 25, 2014 4:09:18 PM (9 years ago)

Author:

vondreele

Message:

another sqrt error trapped

Location:

trunk

Files:

• GSASIIplot.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (3 diffs)

trunk/GSASIIplot.py

@@ -1491 +1491 @@
                 if 'PWDR' in plottype:
                     if G2frame.SqrtPlot:
+                        olderr = np.seterr(invalid='ignore') #get around sqrt(-ve) error
                         W = np.where(xye[4]>=0.,np.sqrt(xye[4]),-np.sqrt(-xye[4]))
+                        np.seterr(invalid=olderr['invalid'])
                         D = np.where(xye[5],(Y-Z),0.)-Ymax*G2frame.delOffset
                     else:
@@ -1609 +1611 @@
             for peak in peaks:
 #                print 'peak',peak
-                if G2frame.qPlot:
-                    Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,peak[0]),color='b')
-                if G2frame.dPlot:
-                    Plot.axvline(G2lat.Pos2dsp(Parms,peak[0]),color='b')
-                else:
-                    Plot.axvline(peak[0],color='b')
+                if peak[2]:
+                    if G2frame.qPlot:
+                        Plot.axvline(2.*np.pi/G2lat.Pos2dsp(Parms,peak[0]),color='b')
+                    if G2frame.dPlot:
+                        Plot.axvline(G2lat.Pos2dsp(Parms,peak[0]),color='b')
+                    else:
+                        Plot.axvline(peak[0],color='b')
             for hkl in G2frame.HKL:
                 clr = 'r'

trunk/GSASIIpwdGUI.py

@@ -2036 +2036 @@
     IndexId = G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Index Peak List')
     Inst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]
+
     def RefreshIndexPeaksGrid(event):
         r,c =  event.GetRow(),event.GetCol()
@@ -2047 +2048 @@
             G2frame.PatternTree.SetItemPyData(IndexId,[peaks,data[1]])
             G2frame.dataDisplay.ForceRefresh()
+            if 'PKS' in G2frame.PatternTree.GetItemText(G2frame.PatternId):
+                G2plt.PlotPowderLines(G2frame)
+            else:
+                G2plt.PlotPatterns(G2frame,plotType='PWDR')
             
     def OnReload(event):
@@ -2078 +2083 @@
             key = event.GetKeyCode()
             for col in colList:
-                if G2frame.IndexPeaksTable.GetColLabelValue(col) in ['use','refine']:
+                if G2frame.IndexPeaksTable.GetColLabelValue(col) in ['use',]:
                     if key == 89: #'Y'
                         for row in range(G2frame.IndexPeaksTable.GetNumberRows()): data[0][row][col]=True