Changeset 1523 for trunk/GSASIIphsGUI.py

Timestamp:

Oct 7, 2014 12:43:33 PM (9 years ago)

Author:

toby

Message:

change isinstance in patch code

File:

• trunk/GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -5282 +5282 @@
             reflSets = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
             reflData = reflSets[phaseName]
-            if isinstance(reflData,list):       #patch for old reflection data
+            if 'list' in str(type(reflData)):       #patch for old reflection data
+            #if isinstance(reflData,list):       #patch for old reflection data
                 RefData = {'RefList':[],'FF':[]}
                 for ref in reflData:
@@ -5377 +5378 @@
             reflSets = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId,'Reflection Lists'))
             reflDict = reflSets[phaseName]
-            if isinstance(reflDict,list):       #patch for old reflection data
+            if 'list' in str(type(reflDict)):       #patch for old reflection data
+            #if isinstance(reflDict,list):       #patch for old reflection data
                 RefData = {'RefList':[],'FF':[]}
                 for ref in reflDict:
@@ -5582 +5584 @@
     if 'MCSA' not in data:
         data['MCSA'] = {'Models':[{'Type':'MD','Coef':[1.0,False,[.8,1.2],],'axis':[0,0,1]}],'Results':[],'AtInfo':{}}
-    if isinstance(data['MCSA']['Results'],dict):
+    #if isinstance(data['MCSA']['Results'],dict):
+    if 'dict' in str(type(data['MCSA']['Results'])):
         data['MCSA']['Results'] = []
 #end patch