Changeset 3980 for trunk/GSASIIpwdGUI.py

Timestamp:

May 15, 2019 4:39:01 PM (6 years ago)

Author:

toby

Message:

fix misc PDF issues

File:

• trunk/GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIpwdGUI.py ¶

@@ -6307 +6307 @@
 
     xydata = {}
+    problem = False
     for key in ['Sample','Sample Bkg.','Container','Container Bkg.']:
         name = data[key]['Name']
-        if name:
-            xydata[key] = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name))
+        if name.strip():
+            pId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,name)
+            if pId == 0:
+                print(key,'Entry',name,'Not found.')
+                problem = True
+                continue                
+            xydata[key] = G2frame.GPXtree.GetItemPyData(pId)
+    if problem:
+        print('PDF computation aborted')
+        return
     powId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data['Sample']['Name'])
     limits = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,powId,'Limits'))[1]
@@ -6799 +6808 @@
             if invalid: return
             Id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,data['diffGRname'])
+            if Id == 0: return
             pId = G2gd.GetGPXtreeItemId(G2frame,Id,'PDF Controls')
+            if pId == 0: return
             subData = G2frame.GPXtree.GetItemPyData(pId)['G(R)']
             data['delt-G(R)'][1] = np.array([subData[1][0],data['G(R)'][1][1]-data['diffMult']*subData[1][1]])
@@ -6868 +6879 @@
                 File.write("#GSAS-II PDF controls file; do not add/delete items!\n")
                 for item in data:
-                    if item[:] not in ['I(Q)','S(Q)','F(Q)','G(R)']:
+                    if item[:] not in ['Sample','I(Q)','S(Q)','F(Q)','G(R)']:
                         File.write(item+':'+unicode(data[item])+'\n')
                 File.close()
@@ -6936 +6947 @@
             return
         auxPlot = computePDF(G2frame,data)
+        if auxPlot is None: return
         G2frame.GetStatusBar().SetStatusText('PDF computed',1)
         for plot in auxPlot: