Changeset 795 for trunk/GSASIIIO.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIIO.py

    r794 r795  
    3737    else:
    3838        return 0
     39
     40def makeInstDict(names,data,codes):
     41    inst = dict(zip(names,zip(data,data,codes)))
     42    for item in inst:
     43        inst[item] = list(inst[item])
     44    return inst
     45
    3946
    4047def FileDlgFixExt(dlg,file):
     
    443450#patch
    444451                if datus[0] == 'Instrument Parameters' and not isinstance(datus[1],dict):
    445                     datus[1] = dict(zip(datus[1][3],zip(datus[1][0],datus[1][1],datus[1][2])))
     452                    if 'PWDR' in datum[0]:
     453                        datus[1] = dict(zip(datus[1][3],zip(datus[1][0],datus[1][1],datus[1][2])))
     454                    else:
     455                        datus[1] = dict(zip(datus[1][2],zip(datus[1][0],datus[1][1])))
    446456                    for item in datus[1]:               #zip makes tuples - now make lists!
    447457                        datus[1][item] = list(datus[1][item])
Note: See TracChangeset for help on using the changeset viewer.