Changeset 2467 for trunk/GSASIIimage.py

Timestamp:

Sep 14, 2016 2:09:49 PM (9 years ago)

Author:

vondreele

Message:

modify 2D strain Dcalc to be dmin+(dmax-dmin)/4. per Yan Gao
begin plot of magnetic moments.

File:

• trunk/GSASIIimage.py (modified) (1 diff)

trunk/GSASIIimage.py ¶

@@ -1067 +1067 @@
         else:
             ring['ImtaCalc'] = np.array([(V+1.)*ring['Dset'],azm])
-        ring['Dcalc'] = np.mean(ring['ImtaCalc'][0])
+        dmin = np.min(ring['ImtaCalc'][0])
+        dmax = np.max(ring['ImtaCalc'][0])
+        ring['Dcalc'] = dmin+(dmax-dmin)/4.
+#        ring['Dcalc'] = np.mean(ring['ImtaCalc'][0])
 
 def calcFij(omg,phi,azm,th):
-    '''Does something...
-
-    Uses parameters as defined by Bob He & Kingsley Smith, Adv. in X-Ray Anal. 41, 501 (1997)
+    '''    Uses parameters as defined by Bob He & Kingsley Smith, Adv. in X-Ray Anal. 41, 501 (1997)
 
     :param omg: his omega = sample omega rotation; 0 when incident beam || sample surface,