Changeset 794

Timestamp:

Oct 24, 2012 11:46:26 AM (11 years ago)

Author:

vondreele

Message:

still more iparm fixes - maybe that's all of them?

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIIO.py (modified) (1 diff)
• GSASIIpwd.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (1 diff)

trunk/GSASII.py

@@ -1132 +1132 @@
                 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='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)

trunk/GSASIIIO.py

@@ -536 +536 @@
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Background'),[['chebyschev',1,3,1.0,0.0,0.0],
                             {'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]}])
-            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Instrument Parameters'),dict(zip(names,zip(parms,parms,codes))))
+            inst = dict(zip(names,zip(parms,parms,codes)))
+            for item in inst:
+                inst[item] = list(inst[item])
+            G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Instrument Parameters'),inst)
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Sample Parameters'),Sample)
             G2frame.PatternTree.SetItemPyData(G2frame.PatternTree.AppendItem(Id,text='Peak List'),[])

trunk/GSASIIpwd.py

@@ -1136 +1136 @@
                             
     def SetInstParms(Inst):
-        insVals,insFlags,insNames = Inst[1:4]
-        dataType = insVals[0]
+        dataType = Inst['Type'][0]
         insVary = []
-        for i,flag in enumerate(insFlags):
-            if flag and insNames[i] in ['U','V','W','X','Y','SH/L','I(L2)/I(L1)']:
-                insVary.append(insNames[i])
+        insNames = []
+        insVals = []
+        for parm in Inst:
+            insNames.append(parm)
+            insVals.append(Inst[parm][1])
+            if parm in ['U','V','W','X','Y','SH/L','I(L2)/I(L1)'] and Inst[parm][2]:
+                insVary.append(parm)
         instDict = dict(zip(insNames,insVals))
         instDict['X'] = max(instDict['X'],0.01)
@@ -1149 +1152 @@
         
     def GetInstParms(parmDict,Inst,varyList,Peaks):
-        instNames = Inst[3]
-        for i,name in enumerate(instNames):
-            Inst[1][i] = parmDict[name]
+        for name in Inst:
+            Inst[name][1] = parmDict[name]
         iPeak = 0
         while True:
@@ -1172 +1174 @@
         ptstr =  'values:'
         sigstr = 'esds  :'
-        instNames = Inst[3][1:]
-        for i,name in enumerate(instNames):
-            ptlbls += "%s" % (name.center(12))
-            ptstr += ptfmt % (Inst[1][i+1])
-            if name in sigDict:
-                sigstr += ptfmt % (sigDict[name])
-            else:
-                sigstr += 12*' '
+        for parm in Inst:
+            if parm in  ['U','V','W','X','Y','SH/L','I(L2)/I(L1)']:
+                ptlbls += "%s" % (parm.center(12))
+                ptstr += ptfmt % (Inst[parm][1])
+                if parm in sigDict:
+                    sigstr += ptfmt % (sigDict[parm])
+                else:
+                    sigstr += 12*' '
         print ptlbls
         print ptstr

trunk/GSASIIpwdGUI.py

@@ -674 +674 @@
                 File.close()
                 data = dict(zip(newItems,zip(newVals,newVals,len(newVals)*[False,])))
+                for item in data:
+                    data[item] = list(data[item])
                 G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Instrument Parameters'),data)
                 RefreshInstrumentGrid(event,doAnyway=True)          #to get peaks updated