Changeset 3980

Timestamp:

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

Author:

toby

Message:

fix misc PDF issues

Location:

trunk

Files:

• GSASIIIO.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIIO.py

@@ -567 +567 @@
     return
 
-objectScanIgnore = [int,bool,float,str,np.float64,np.int32,np.int64,np.ndarray,G2obj.G2VarObj,G2obj.ExpressionObj]
+objectScanIgnore = [int,bool,float,str,np.float64,np.float32,np.int32,np.int64,np.ndarray,G2obj.G2VarObj,G2obj.ExpressionObj]
 try:
     objectScanIgnore += [ma.MaskedArray] # fails in doc builds

trunk/GSASIIdataGUI.py

@@ -4219 +4219 @@
                                 ElList['C'] = ElData
                     ElLists.append(ElList)
-                id, cookie = self.GPXtree.GetNextChild(self.root, cookie)
+                Id, cookie = self.GPXtree.GetNextChild(self.root, cookie)
             if len(TextList) < 1:
                 self.ErrorDialog('Nothing to make PDFs for','There must be at least one "PWDR" pattern')

trunk/GSASIIimgGUI.py

@@ -302 +302 @@
                         Data = G2frame.GPXtree.GetItemPyData(CId)
                         same = True
-                        for item in ['tilt','distance','rotation','center','DetDepth','azmthOff']:
+                        for item in ['tilt','distance','rotation','DetDepth','azmthOff']:
                             if Data[item] != oldData[item]:
+                                same = False
+                        if (Data['center'][0] != oldData['center'][0] or
+                            Data['center'][1] != oldData['center'][1]):
                                 same = False
                         if not same:

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: