Changeset 893

Timestamp:

Apr 27, 2013 11:42:35 AM (11 years ago)

Author:

vondreele

Message:

final check on 2D penetration correction

File:

• trunk/GSASIIimage.py (modified) (5 diffs)

trunk/GSASIIimage.py

@@ -53 +53 @@
         p1x,p1y = p2x,p2y
     return Inside
+    
+def peneCorr(tth,dep):
+    return dep*(1.-npcosd(tth))         #best one
+#    return dep*npsind(tth)             #not as good as 1-cos2Q
         
 def makeMat(Angle,Axis):
@@ -162 +166 @@
             wave = B[-1]
         tth = 2.0*npasind(wave/(2.*dsp))
-        dxy = dep*(1.-npcosd(tth))
+        dxy = peneCorr(tth,dep)
         ttth = nptand(tth)
         radius = (dist+dxy)*ttth
@@ -294 +298 @@
     ctth = cosd(tth)
     cosb = cosd(tilt)
-    dxy = dep*(1.-npcosd(tth))
+    dxy = peneCorr(tth,dep)
     radius = ttth*(dist+dxy)
     radii[1] = (dist+dxy)*stth*ctth*cosb/(cosb**2-stth**2)
@@ -325 +329 @@
     dep = data['DetDepth']
     tth = 2.0*asind(wave/(2.*dsp))
-    dxy = dep*(1.-npcosd(tth))
+    dxy = peneCorr(tth,dep)
     ttth = tand(tth)
     radius = (dist+dxy)*ttth
@@ -359 +363 @@
     Z = np.dot(X,makeMat(tilt,0)).T[2]
     tth = npatand(np.sqrt(dx**2+dy**2-Z**2)/(dist-Z))
-    dxy = dep*(1.-npcosd(tth))
+    dxy = peneCorr(tth,dep)
     tth = npatand(np.sqrt(dx**2+dy**2-Z**2)/(dist-Z+dxy))
     dsp = wave/(2.*npsind(tth/2.))