Changeset 4850 for trunk

Timestamp:

Mar 11, 2021 11:32:08 AM (2 years ago)

Author:

vondreele

Message:

fix LeBail? test to skip HKLF histograms in G2strMain
fix DBW access for old gpx files in G2dataGUI
fix Quaternion access for old gpx files in G2plot
add new testSytSym.py routine

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMain.py (modified) (1 diff)
• testSytSym.py (added)

trunk/GSASIIdataGUI.py

@@ -7211 +7211 @@
             ' Data residual wR: %.3f%% on %d observations'%(data[0]['wR'],data[0]['Nobs'])))
         if kind == 'PWDR':
-            DBW = ma.getdata(data[0]['Durbin-Watson'])
+            try:    #old gpx file
+                DBW = ma.getdata(data[0]['Durbin-Watson'])
+            except KeyError:
+                DBW = 1.0
             mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Durbin-Watson statistic: %.3f'%DBW))
         for value in data[0]:

trunk/GSASIIplot.py

@@ -9864 +9864 @@
     if 'Plane' not in drawingData:
         drawingData['Plane'] = [[0,0,1],False,False,0.0,[255,255,0]]
+    if 'Quaternion' not in drawingData:
+        drawingData['Quaternion'] = [0.,0.,0,1.]
     resRBData = data['RBModels'].get('Residue',[])
     vecRBData = data['RBModels'].get('Vector',[])

trunk/GSASIIstrMain.py

@@ -509 +509 @@
             #phase['Histograms'][h]
             if not phase['Histograms'][h]['Use']: continue
-            if phase['Histograms'][h].get('LeBail',False):
-                 return True
+            try:
+                if phase['Histograms'][h]['LeBail']:
+                     return True
+            except KeyError:    #HKLF & old gpx files
+                pass
     return False