Changeset 795 for trunk/GSASIIIO.py

Timestamp:

Nov 3, 2012 3:22:36 PM (10 years ago)

Author:

vondreele

Message:

implement TOF input, peak search & fitting
auto peak search
convert instrument parms to dictionary
add charge flip on max rho

File:

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

trunk/GSASIIIO.py

@@ -37 +37 @@
     else:
         return 0
+
+def makeInstDict(names,data,codes):
+    inst = dict(zip(names,zip(data,data,codes)))
+    for item in inst:
+        inst[item] = list(inst[item])
+    return inst
+
 
 def FileDlgFixExt(dlg,file):
@@ -443 +450 @@
 #patch
                 if datus[0] == 'Instrument Parameters' and not isinstance(datus[1],dict):
-                    datus[1] = dict(zip(datus[1][3],zip(datus[1][0],datus[1][1],datus[1][2])))
+                    if 'PWDR' in datum[0]:
+                        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])