Changeset 3712 for trunk/GSASIIplot.py

Timestamp:

Oct 30, 2018 8:50:07 AM (4 years ago)

Author:

vondreele

Message:

add new configuration item: PDF_Rmax maximum radius for G(r) calculations; rarely changed by user
Change PDF GUI Rmax to be for the max r for G(r) plot - no longer r max for calculation
This speeds up optimization
Fix problems with PDF peak table - principally the rowlabels needed to be str not int - crashed wx 4.0 & gave bizarre effects in wx 3.

File:

• trunk/GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIplot.py

@@ -4104 +4104 @@
             del Peaks['Peaks'][lineNo-2]
         G2frame.itemPicked = None
-        G2pdG.UpdatePDFPeaks(G2frame,Peaks,data)
-        PlotISFG(G2frame,data,peaks=Peaks,newPlot=False)
+        wx.CallAfter(G2pdG.UpdatePDFPeaks,G2frame,Peaks,data)
+        wx.CallAfter(PlotISFG,G2frame,data,peaks=Peaks,newPlot=False)
 
     # PlotISFG continues here
@@ -4172 +4172 @@
         Plot.set_xlabel(r'r,$\AA$',fontsize=14)
         Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
+        if lim is not None:
+            lim[0] = list([lim[0][0],data['Rmax']])
+            Plot.set_xlim(lim[0])
     else:
         Plot.set_xlabel(r'$Q,\AA^{-1}$',fontsize=14)
@@ -4275 +4278 @@
                 Yb = [0.,-10.*np.pi*numbDen]
                 Plot.plot(Xb,Yb,color='k',dashes=(5,5))
+                Plot.set_xlim([0.,PDFdata['Rmax']])
             elif plotType == 'F(Q)':
                 Plot.axhline(0.,color='k')