Changeset 1631

Timestamp:

Jan 15, 2015 3:16:45 PM (8 years ago)

Author:

toby

Message:

fix seq ref table for older .gpx files

File:

• trunk/GSASIIgrid.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -3258 +3258 @@
             if 'IMG' in name:
                 for item in sampleParmDict:
-                    sampleParmDict[item].append(data[name]['parmDict'][item])
+                    sampleParmDict[item].append(data[name]['parmDict'].get(item,0))
             else:
                 Id = GetPatternTreeItemId(G2frame,G2frame.root,name)
                 sampleData = G2frame.PatternTree.GetItemPyData(GetPatternTreeItemId(G2frame,Id,'Sample Parameters'))
                 for item in sampleParmDict:
-                    sampleParmDict[item].append(sampleData[item])
+                    sampleParmDict[item].append(sampleData.get(item,0))
         for item in sampleParmDict:
             frstValue = sampleParmDict[item][0]
@@ -3997 +3997 @@
         Types += [wg.GRID_VALUE_FLOAT+':10,3',]
     # add % change in Chi^2 in last cycle
-    if histNames[0][:4] not in ['SASD','IMG '] and Controls['ShowCell']:
+    if histNames[0][:4] not in ['SASD','IMG '] and Controls.get('ShowCell'):
         colList += [[100.*data[name]['Rvals'].get('DelChi2',-1) for name in histNames]]
         colSigs += [None]