Changeset 2155 for trunk/GSASIIstrMath.py

Timestamp:

Feb 23, 2016 10:20:56 AM (7 years ago)

Author:

vondreele

Message:

fix bug - Mustrain: should be Mustrain; everywhere

File:

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

trunk/GSASIIstrMath.py

@@ -2765 +2765 @@
             Sum = 0
             for i,strm in enumerate(Strms):
-                Sum += parmDict[phfx+'Mustrain:'+str(i)]*strm
+                Sum += parmDict[phfx+'Mustrain;'+str(i)]*strm
             Mgam = 0.018*refl[4+im]**2*tand(refl[5+im]/2.)*np.sqrt(Sum)/np.pi
     elif 'T' in calcControls[hfx+'histType']:       #All checked & OK
@@ -2796 +2796 @@
             Sum = 0
             for i,strm in enumerate(Strms):
-                Sum += parmDict[phfx+'Mustrain:'+str(i)]*strm
+                Sum += parmDict[phfx+'Mustrain;'+str(i)]*strm
             Mgam = 1.e-6*parmDict[hfx+'difC']*np.sqrt(Sum)*refl[4+im]**3
             
@@ -2868 +2868 @@
             Sum = 0
             for i,strm in enumerate(Strms):
-                Sum += parmDict[phfx+'Mustrain:'+str(i)]*strm
-                gamDict[phfx+'Mustrain:'+str(i)] = strm*parmDict[phfx+'Mustrain;mx']/2.
-                sigDict[phfx+'Mustrain:'+str(i)] = strm*(1.-parmDict[phfx+'Mustrain;mx'])**2
+                Sum += parmDict[phfx+'Mustrain;'+str(i)]*strm
+                gamDict[phfx+'Mustrain;'+str(i)] = strm*parmDict[phfx+'Mustrain;mx']/2.
+                sigDict[phfx+'Mustrain;'+str(i)] = strm*(1.-parmDict[phfx+'Mustrain;mx'])**2
             Mgam = const*np.sqrt(Sum)
             for i in range(len(Strms)):
-                gamDict[phfx+'Mustrain:'+str(i)] *= Mgam/Sum
-                sigDict[phfx+'Mustrain:'+str(i)] *= const**2/ateln2
+                gamDict[phfx+'Mustrain;'+str(i)] *= Mgam/Sum
+                sigDict[phfx+'Mustrain;'+str(i)] *= const**2/ateln2
         gamDict[phfx+'Mustrain;mx'] = Mgam
         sigDict[phfx+'Mustrain;mx'] = -2.*Mgam**2*(1.-parmDict[phfx+'Mustrain;mx'])/ateln2
@@ -2936 +2936 @@
             Sum = 0
             for i,strm in enumerate(Strms):
-                Sum += parmDict[phfx+'Mustrain:'+str(i)]*strm
-                gamDict[phfx+'Mustrain:'+str(i)] = strm*parmDict[phfx+'Mustrain;mx']/2.
-                sigDict[phfx+'Mustrain:'+str(i)] = strm*(1.-parmDict[phfx+'Mustrain;mx'])**2
+                Sum += parmDict[phfx+'Mustrain;'+str(i)]*strm
+                gamDict[phfx+'Mustrain;'+str(i)] = strm*parmDict[phfx+'Mustrain;mx']/2.
+                sigDict[phfx+'Mustrain;'+str(i)] = strm*(1.-parmDict[phfx+'Mustrain;mx'])**2
             Mgam = const*np.sqrt(Sum)
             for i in range(len(Strms)):
-                gamDict[phfx+'Mustrain:'+str(i)] *= Mgam/Sum
-                sigDict[phfx+'Mustrain:'+str(i)] *= const**2/ateln2        
+                gamDict[phfx+'Mustrain;'+str(i)] *= Mgam/Sum
+                sigDict[phfx+'Mustrain;'+str(i)] *= const**2/ateln2        
         gamDict[phfx+'Mustrain;mx'] = Mgam
         sigDict[phfx+'Mustrain;mx'] = -2.*Mgam**2*(1.-parmDict[phfx+'Mustrain;mx'])/ateln2