Changeset 1480 for trunk/GSASIIstrMath.py

Timestamp:

Aug 27, 2014 12:59:17 PM (9 years ago)

Author:

vondreele

Message:

reset mustrain now gives correct SHKL coefficients for a 1000 mustrain
generalized mustrain now scaled correctly by 0.018/pi

File:

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

trunk/GSASIIstrMath.py

@@ -1190 +1190 @@
             for i,strm in enumerate(Strms):
                 Sum += parmDict[phfx+'Mustrain:'+str(i)]*strm
-            Mgam = refl[4]**2*tand(refl[5]/2.)*np.sqrt(Sum)
+            Mgam = 0.018*refl[4]**2*tand(refl[5]/2.)*np.sqrt(Sum)/np.pi
     elif 'T' in calcControls[hfx+'histType']:
         #crystallite size
@@ -1289 +1289 @@
             sigDict[phfx+'Mustrain;a'] = 2*(Mgam/Sa+dsa)*Mgam*(1.-parmDict[phfx+'Mustrain;mx'])**2/ateln2       
         else:       #generalized - P.W. Stephens model
-            const = refl[4]**2*tanth
+            const = 0.018*refl[4]**2*tanth/np.pi
             Strms = G2spc.MustrainCoeff(refl[:3],SGData)
             Sum = 0