Changeset 2192

Timestamp:

Apr 1, 2016 1:35:44 PM (7 years ago)

Author:

vondreele

Message:

fix bug in absorption correction in image integration

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIpwd.py (modified) (3 diffs)

trunk/GSASIIimgGUI.py

@@ -84 +84 @@
             backImage += darkImage*darkScale                
         sumImg += backImage*backScale
-    sumImg -= data['Flat Bkg']
+    sumImg -= data.get('Flat Bkg',0.)
     return sumImg
     

trunk/GSASIIpwd.py

@@ -131 +131 @@
     '''
     
-    def muRunder3(Sth2):
+    def muRunder3(MuR,Sth2):
         T0 = 16.0/(3.*np.pi)
         T1 = (25.99978-0.01911*Sth2**0.25)*np.exp(-0.024551*Sth2)+ \
@@ -141 +141 @@
         return np.exp(Trns)
     
-    def muRover3(Sth2):
+    def muRover3(MuR,Sth2):
         T1 = 1.433902+11.07504*Sth2-8.77629*Sth2*Sth2+ \
             10.02088*Sth2**3-3.36778*Sth2**4
@@ -155 +155 @@
     Cth2 = 1.-Sth2
     if 'Cylinder' in Geometry:      #Lobanov & Alte da Veiga for 2-theta = 0; beam fully illuminates sample
-        if MuR <= 3.0:
-            return muRunder3(Sth2)
+        if 'array' in str(type(MuR)):
+            MuRSTh2 = np.concatenate((MuR,Sth2))
+            AbsCr = np.where(MuRSTh2[0]<=3.0,muRunder3(MuRSTh2[0],MuRSTh2[1]),muRover3(MuRSTh2[0],MuRSTh2[1]))
+            return AbsCr
         else:
-            return muRover3(Sth2)
+            if MuR <= 3.0:
+                return muRunder3(MuR,Sth2)
+            else:
+                return muRover3(MuR,Sth2)
     elif 'Bragg' in Geometry:
         return 1.0