Changeset 440 for trunk/GSASIIstruct.py

Timestamp:

Dec 11, 2011 1:55:19 PM (11 years ago)

Author:

vondreele

Message:

fix the mustrain ve microstrain title problem = GSASII.py
take wx,CallAfter? back out of most places - caused problems
get aniso size/mustrain ellipsoid around the right way to match ellipsoid model - exchanged sin & cos.

File:

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

trunk/GSASIIstruct.py

@@ -1905 +1905 @@
         cosP,sinP = G2lat.CosSinAngle(H,P,G)
         gam = (1.8*wave/np.pi)/(parmDict[phfx+'Size:0']*parmDict[phfx+'Size:1']*costh)
-        gam *= np.sqrt((cosP*parmDict[phfx+'Size:1'])**2+(sinP*parmDict[phfx+'Size:0'])**2)
+        gam *= np.sqrt((sinP*parmDict[phfx+'Size:1'])**2+(cosP*parmDict[phfx+'Size:0'])**2)
     else:           #ellipsoidal crystallites
         Sij =[parmDict[phfx+'Size:%d'%(i)] for i in range(6)]
@@ -1943 +1943 @@
         Sa = parmDict[phfx+'Size:1']
         gami = (1.8*wave/np.pi)/(Si*Sa)
-        sqtrm = np.sqrt((cosP*Sa)**2+(sinP*Si)**2)
+        sqtrm = np.sqrt((sinP*Sa)**2+(cosP*Si)**2)
         gam = gami*sqtrm/costh            
-        gamDict[phfx+'Size:0'] = gami*Si*sinP**2/(sqtrm*costh)-gam/Si
-        gamDict[phfx+'Size:1'] = gami*Sa*cosP**2/(sqtrm*costh)-gam/Sa         
+        gamDict[phfx+'Size:0'] = gami*Si*cosP**2/(sqtrm*costh)-gam/Si
+        gamDict[phfx+'Size:1'] = gami*Sa*sinP**2/(sqtrm*costh)-gam/Sa         
     else:           #ellipsoidal crystallites
         const = 1.8*wave/(np.pi*costh)