Changeset 1793


Ignore:
Timestamp:
Apr 17, 2015 12:31:34 PM (7 years ago)
Author:
vondreele
Message:

a few more corrections to texture stuff

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIlattice.py

    r1792 r1793  
    11631163    'needs doc string'
    11641164    import pytexture as ptx
    1165     if psi.shape:
     1165    if 'float' in str(type(psi)):
     1166        psrs,dpdps = ptx.pyplmpsi(L,M,1,psi)
     1167    else:
    11661168        psrs = np.array([ptx.pyplmpsi(L,M,1,p) for p in psi])
    11671169        psrs,dpdps = np.reshape(psrs.flatten(),(-1,2)).T
    1168     else:
    1169         psrs,dpdps = ptx.pyplmpsi(L,M,1,psi)
    11701170    psrs *= RSQ2PI
    11711171    dpdps *= RSQ2PI
  • trunk/GSASIIstrMath.py

    r1792 r1793  
    407407                    toler = calcControls[phfx+'SHtoler']
    408408                    wt = 1./toler**2
    409                     HKLs = calcControls[phfx+'SHhkl']
     409                    HKLs = np.array(calcControls[phfx+'SHhkl'])
    410410                    SHnames = calcControls[phfx+'SHnames']
    411411                    SHcof = dict(zip(SHnames,[parmDict[phfx+cof] for cof in SHnames]))
Note: See TracChangeset for help on using the changeset viewer.