Changeset 796 for trunk/GSASIIIO.py

Timestamp:

Nov 7, 2012 2:54:48 PM (10 years ago)

Author:

vondreele

Message:

revise instrument parameters (again); now two dictionaries
revise key stroke options on plots

File:

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

trunk/GSASIIIO.py

@@ -449 +449 @@
                 sub = G2frame.PatternTree.AppendItem(Id,datus[0])
 #patch
-                if datus[0] == 'Instrument Parameters' and not isinstance(datus[1],dict):
+                if datus[0] == 'Instrument Parameters' and len(datus[1]) == 1:
                     if 'PWDR' in datum[0]:
-                        datus[1] = dict(zip(datus[1][3],zip(datus[1][0],datus[1][1],datus[1][2])))
+                        datus[1] = [dict(zip(datus[1][3],zip(datus[1][0],datus[1][1],datus[1][2]))),{}]
                     else:
-                        datus[1] = dict(zip(datus[1][2],zip(datus[1][0],datus[1][1])))
-                    for item in datus[1]:               #zip makes tuples - now make lists!
-                        datus[1][item] = list(datus[1][item])
+                        datus[1] = [dict(zip(datus[1][2],zip(datus[1][0],datus[1][1]))),{}]
+                    for item in datus[1][0]:               #zip makes tuples - now make lists!
+                        datus[1][0][item] = list(datus[1][0][item])
 #end patch
                 G2frame.PatternTree.SetItemPyData(sub,datus[1])
@@ -532 +532 @@
             G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Background'),[['chebyschev',1,3,1.0,0.0,0.0],
                             {'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]}])
-            inst = dict(zip(names,zip(parms,parms,codes)))
-            for item in inst:
-                inst[item] = list(inst[item])
+            inst = [dict(zip(names,zip(parms,parms,codes))),{}]
+            for item in inst[0]:
+                inst[0][item] = list(inst[0][item])
             G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Instrument Parameters'),inst)
             G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,Id,'Peak List'),[])
@@ -546 +546 @@
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Background'),[['chebyschev',1,3,1.0,0.0,0.0],
                             {'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]}])
-            inst = dict(zip(names,zip(parms,parms,codes)))
-            for item in inst:
-                inst[item] = list(inst[item])
+            inst = [dict(zip(names,zip(parms,parms,codes))),{}]
+            for item in inst[0]:
+                inst[0][item] = list(inst[0][item])
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Instrument Parameters'),inst)
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
@@ -569 +569 @@
         PickId = G2gd.GetPatternTreeItemId(G2frame, G2frame.root, export)
         Inst = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame, \
-            PickId, 'Instrument Parameters'))
+            PickId, 'Instrument Parameters'))[0]
         prm.write( '            123456789012345678901234567890123456789012345678901234567890        '+'\n')
         prm.write( 'INS   BANK      1                                                               '+'\n')