Changeset 5008

Timestamp:

Aug 5, 2021 7:43:13 AM (2 years ago)

Author:

vondreele

Message:

fix bug in G2plot for missing g(R) plot
fix SingleFloatDialog? "format" argument; should be 'fmt'

Location:

trunk

Files:

• GSASIIfiles.py (modified) (1 diff)
• GSASIIimage.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIfiles.py

@@ -1020 +1020 @@
         G2Print (' G(R) saved to: '+grfilename)
         
-    if PDFsaves[5]: #RMCProfile files for F(Q) & g(r) overwrites any above
+    if len(PDFsaves) > 5 and PDFsaves[5]: #RMCProfile files for F(Q) & g(r) overwrites any above
         
         fqfilename = fileroot+'.fq'

trunk/GSASIIimage.py

@@ -699 +699 @@
         dxyz0[:,:,2] += dzp
 #non zero detector 2-theta:
-    if data['det2theta']:        
+    if data.get('det2theta',0):        
         tthMat = makeMat(data['det2theta'],1)
         dxyz = np.inner(dxyz0,tthMat.T)

trunk/GSASIIimgGUI.py

@@ -147 +147 @@
 ''' Do not use if pattern has uneven absorption
  Set 2-theta max in image controls to be fully inside image 
- Enter 2-theta position for arc mask (32-%.1f) '''%IOtth[1],IOtth[1],IOtth,format='%.2f')
+ Enter 2-theta position for arc mask (32-%.1f) '''%IOtth[1],IOtth[1],IOtth,fmt='%.2f')
         if dlg.ShowModal() == wx.ID_OK:
             arcTth = dlg.GetValue()

trunk/GSASIIplot.py

@@ -5040 +5040 @@
             Id = G2gd.GetGPXtreeItemId(G2frame,Pid,'PDF Controls')
             Pattern = G2frame.GPXtree.GetItemPyData(Id)
-            if Pattern:
+            if Pattern and plotType in Pattern:
                 PlotList.append(Pattern[plotType])
         name = plotType