Changeset 893


Ignore:
Timestamp:
Apr 27, 2013 11:42:35 AM (9 years ago)
Author:
vondreele
Message:

final check on 2D penetration correction

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimage.py

    r892 r893  
    5353        p1x,p1y = p2x,p2y
    5454    return Inside
     55   
     56def peneCorr(tth,dep):
     57    return dep*(1.-npcosd(tth))         #best one
     58#    return dep*npsind(tth)             #not as good as 1-cos2Q
    5559       
    5660def makeMat(Angle,Axis):
     
    162166            wave = B[-1]
    163167        tth = 2.0*npasind(wave/(2.*dsp))
    164         dxy = dep*(1.-npcosd(tth))
     168        dxy = peneCorr(tth,dep)
    165169        ttth = nptand(tth)
    166170        radius = (dist+dxy)*ttth
     
    294298    ctth = cosd(tth)
    295299    cosb = cosd(tilt)
    296     dxy = dep*(1.-npcosd(tth))
     300    dxy = peneCorr(tth,dep)
    297301    radius = ttth*(dist+dxy)
    298302    radii[1] = (dist+dxy)*stth*ctth*cosb/(cosb**2-stth**2)
     
    325329    dep = data['DetDepth']
    326330    tth = 2.0*asind(wave/(2.*dsp))
    327     dxy = dep*(1.-npcosd(tth))
     331    dxy = peneCorr(tth,dep)
    328332    ttth = tand(tth)
    329333    radius = (dist+dxy)*ttth
     
    359363    Z = np.dot(X,makeMat(tilt,0)).T[2]
    360364    tth = npatand(np.sqrt(dx**2+dy**2-Z**2)/(dist-Z))
    361     dxy = dep*(1.-npcosd(tth))
     365    dxy = peneCorr(tth,dep)
    362366    tth = npatand(np.sqrt(dx**2+dy**2-Z**2)/(dist-Z+dxy))
    363367    dsp = wave/(2.*npsind(tth/2.))
Note: See TracChangeset for help on using the changeset viewer.