Ignore:
Timestamp:
Nov 21, 2014 3:25:30 PM (7 years ago)
Author:
vondreele
Message:

add wx.Yield in RefineBox?
refactor indexing for normal & superlattice PeaksPrint?
remove splitter window in Unit Cells Data display - didn't work in newer wxPythons

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIlattice.py

    r1489 r1578  
    462462    return rdsq
    463463       
     464def calc_rDsqZSS(H,A,vec,Z,tth,lam):
     465    'needs doc string'
     466    rpd = np.pi/180.
     467    rdsq = calc_rDsq(H[:3]+(H[3][:,np.newaxis]*vec).T,A)+Z*sind(tth)*2.0*rpd/lam**2
     468    return rdsq
     469       
    464470def calc_rDsqT(H,A,Z,tof,difC):
    465471    'needs doc string'
    466472    rdsq = calc_rDsq(H,A)+Z/difC
     473    return rdsq
     474       
     475def calc_rDsqTSS(H,A,vec,Z,tof,difC):
     476    'needs doc string'
     477    rdsq = calc_rDsq(H[:3]+H[3][:,np.newaxis]*vec,A)+Z/difC
    467478    return rdsq
    468479       
     
    478489    return Hmax
    479490   
    480 def sortHKLd(HKLd,ifreverse,ifdup):
     491def sortHKLd(HKLd,ifreverse,ifdup,ifSS=False):
    481492    '''needs doc string
    482493
     
    486497    '''
    487498    T = []
     499    N = 3
     500    if ifSS:
     501        N = 4
    488502    for i,H in enumerate(HKLd):
    489503        if ifdup:
    490             T.append((H[3],i))
     504            T.append((H[N],i))
    491505        else:
    492             T.append(H[3])           
     506            T.append(H[N])           
    493507    D = dict(zip(T,HKLd))
    494508    T.sort()
Note: See TracChangeset for help on using the changeset viewer.