Changeset 1793

Timestamp:

Apr 17, 2015 12:31:34 PM (8 years ago)

Author:

vondreele

Message:

a few more corrections to texture stuff

Location:

trunk

Files:

• GSASIIlattice.py (modified) (1 diff)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIIlattice.py

@@ -1163 +1163 @@
     'needs doc string'
     import pytexture as ptx
-    if psi.shape:
+    if 'float' in str(type(psi)):
+        psrs,dpdps = ptx.pyplmpsi(L,M,1,psi)
+    else:
         psrs = np.array([ptx.pyplmpsi(L,M,1,p) for p in psi])
         psrs,dpdps = np.reshape(psrs.flatten(),(-1,2)).T
-    else:
-        psrs,dpdps = ptx.pyplmpsi(L,M,1,psi)
     psrs *= RSQ2PI
     dpdps *= RSQ2PI

trunk/GSASIIstrMath.py

@@ -407 +407 @@
                     toler = calcControls[phfx+'SHtoler']
                     wt = 1./toler**2
-                    HKLs = calcControls[phfx+'SHhkl']
+                    HKLs = np.array(calcControls[phfx+'SHhkl'])
                     SHnames = calcControls[phfx+'SHnames']
                     SHcof = dict(zip(SHnames,[parmDict[phfx+cof] for cof in SHnames]))