Changeset 793 for trunk/GSASII.py

Timestamp:

Oct 24, 2012 9:38:52 AM (10 years ago)

Author:

vondreele

Message:

more iparm fixes

File:

• trunk/GSASII.py (modified) (5 diffs)

trunk/GSASII.py

@@ -557 +557 @@
             S = File.readline()                
         File.close()
-        return dict(zip(newItems,zip(newVals,newVals,len(newVals)*[False,])))
+        inst = dict(zip(newItems,zip(newVals,newVals,len(newVals)*[False,])))
+        for item in inst:
+            inst[item] = list(inst[item])
+        return inst
         
     def ReadPowderIparm(self,instfile,bank,databanks,rd):
@@ -655 +658 @@
                     data.extend([0.0,0.0,0.002,azm])                                      #OK defaults if fxn #3 not 1st in iprm file
                 codes.extend([0,0,0,0,0,0,0])
-                return dict(zip(names,zip(data,data,codes)))
+                inst = dict(zip(names,zip(data,data,codes)))
+                for item in inst:
+                    inst[item] = list(inst[item])
+                return inst
             elif 'T' in DataType:
                 names = ['Type','2-theta','difC','difA','Zero','alpha','beta-0','beta-1','var-inst','X','Y','Azimuth']
@@ -682 +688 @@
                         s = Iparm['INS  1PRCF12'].split()
                         data.extend([G2IO.sfloat(s[0]),0.0,0.0,azm])
-                return dict(zip(names,zip(data,data,codes)))
+                inst = dict(zip(names,zip(data,data,codes)))
+                for item in inst:
+                    inst[item] = list(inst[item])
+                return inst
 
         # stuff we might need from the reader
@@ -1119 +1128 @@
                 data = ['PKS',Cuka,0.0]
                 names = ['Type','Lam','Zero'] 
-                codes = [0,0]
-                self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Instrument Parameters'),dict(zip(names,zip(data,data,codes))))
+                codes = [0,0,0]
+                inst = dict(zip(names,zip(data,data,codes)))
+                for item in inst:
+                    inst[item] = list(inst[item])
+            self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Instrument Parameters'),inst)
                 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Comments'),comments)
                 self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Index Peak List'),peaks)
@@ -1430 +1442 @@
         SumList = []
         Names = []
-        Inst = []
+        Inst = {}
         SumItemList = []
         Comments = ['Sum equals: \n']