Changeset 893
 Timestamp:
 Apr 27, 2013 11:42:35 AM (10 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIimage.py
r892 r893 53 53 p1x,p1y = p2x,p2y 54 54 return Inside 55 56 def peneCorr(tth,dep): 57 return dep*(1.npcosd(tth)) #best one 58 # return dep*npsind(tth) #not as good as 1cos2Q 55 59 56 60 def makeMat(Angle,Axis): … … 162 166 wave = B[1] 163 167 tth = 2.0*npasind(wave/(2.*dsp)) 164 dxy = dep*(1.npcosd(tth))168 dxy = peneCorr(tth,dep) 165 169 ttth = nptand(tth) 166 170 radius = (dist+dxy)*ttth … … 294 298 ctth = cosd(tth) 295 299 cosb = cosd(tilt) 296 dxy = dep*(1.npcosd(tth))300 dxy = peneCorr(tth,dep) 297 301 radius = ttth*(dist+dxy) 298 302 radii[1] = (dist+dxy)*stth*ctth*cosb/(cosb**2stth**2) … … 325 329 dep = data['DetDepth'] 326 330 tth = 2.0*asind(wave/(2.*dsp)) 327 dxy = dep*(1.npcosd(tth))331 dxy = peneCorr(tth,dep) 328 332 ttth = tand(tth) 329 333 radius = (dist+dxy)*ttth … … 359 363 Z = np.dot(X,makeMat(tilt,0)).T[2] 360 364 tth = npatand(np.sqrt(dx**2+dy**2Z**2)/(distZ)) 361 dxy = dep*(1.npcosd(tth))365 dxy = peneCorr(tth,dep) 362 366 tth = npatand(np.sqrt(dx**2+dy**2Z**2)/(distZ+dxy)) 363 367 dsp = wave/(2.*npsind(tth/2.))
Note: See TracChangeset
for help on using the changeset viewer.