Changeset 5018

Timestamp:

Aug 29, 2021 9:13:06 AM (2 years ago)

Author:

vondreele

Message:

do np.nan_to_num on xye to avoid nans in plotting arrays.
remove extra reference to data in OnRelease? for reflection lists
move an import to top, fix a reference to 'B' in MakeRDF

Location:

trunk

Files:

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

trunk/GSASIIplot.py

@@ -2767 +2767 @@
                 pick = str(G2frame.itemPicked).split('(',1)[1][:-1]
                 if 'line' not in pick:       #avoid data points, etc.
-                    data = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)
                     if pick in Page.phaseList:
                         num = Page.phaseList.index(pick)
@@ -3251 +3250 @@
     for ip,Pattern in enumerate(PlotList):
         xye = Pattern[1]
+        xye = np.nan_to_num(xye)
         if xye[1] is None: continue
         if Ymax is None: Ymax = max(xye[1])

trunk/GSASIIpwd.py

@@ -32 +32 @@
 import scipy.optimize as so
 import scipy.special as sp
+import scipy.signal as signal
 
 import GSASIIpath
@@ -506 +507 @@
     
 def MakeRDF(RDFcontrols,background,inst,pwddata):
-    import scipy.signal as signal
     auxPlot = []
-    if 'C' in inst['Type'][0]:
+    if 'C' in inst['Type'][0] or 'B' in inst['Type'][0]:
         Tth = pwddata[0]
         wave = G2mth.getWave(inst)
@@ -530 +530 @@
     Qdata *= np.sin((Qpoints-minQ)*piDQ)/piDQ
     Qdata *= 0.5*np.sqrt(Qpoints)       #Qbin normalization
-#    GSASIIpath.IPyBreak()
     dq = Qpoints[1]-Qpoints[0]
     nR = len(Qdata)