Ignore:
Timestamp:
Mar 27, 2015 2:46:30 PM (7 years ago)
Author:
vondreele
Message:

correct old LANSCE/HIPD import to give correct Omega, chi & phi from goniometer
correct 2-theta from TOF & use abs(Tth) as needed in Lorentz calc for TOF
some corrections to texture calcs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIstrMath.py

    r1762 r1766  
    12791279    if 'Debye' in calcControls[hfx+'instType']:
    12801280        if 'T' in calcControls[hfx+'histType']:
    1281             return G2pwd.Absorb('Cylinder',parmDict[hfx+'Absorption']*refl[14+im],parmDict[hfx+'2-theta'],0,0)
     1281            return G2pwd.Absorb('Cylinder',parmDict[hfx+'Absorption']*refl[14+im],abs(parmDict[hfx+'2-theta']),0,0)
    12821282        else:
    12831283            return G2pwd.Absorb('Cylinder',parmDict[hfx+'Absorption'],refl[5+im],0,0)
     
    12891289    if 'Debye' in calcControls[hfx+'instType']:
    12901290        if 'T' in calcControls[hfx+'histType']:
    1291             return G2pwd.AbsorbDerv('Cylinder',parmDict[hfx+'Absorption']*refl[14+im],parmDict[hfx+'2-theta'],0,0)
     1291            return G2pwd.AbsorbDerv('Cylinder',parmDict[hfx+'Absorption']*refl[14+im],abs(parmDict[hfx+'2-theta']),0,0)
    12921292        else:
    12931293            return G2pwd.AbsorbDerv('Cylinder',parmDict[hfx+'Absorption'],refl[5+im],0,0)
     
    13001300    pi2 = np.sqrt(2./np.pi)
    13011301    if 'T' in calcControls[hfx+'histType']:
    1302         sth2 = sind(parmDict[hfx+'2-theta']/2.)**2
     1302        sth2 = sind(abs(parmDict[hfx+'2-theta'])/2.)**2
    13031303        wave = refl[14+im]
    13041304    else:   #'C'W
     
    13271327    pi2 = np.sqrt(2./np.pi)
    13281328    if 'T' in calcControls[hfx+'histType']:
    1329         sth2 = sind(parmDict[hfx+'2-theta']/2.)**2
     1329        sth2 = sind(abs(parmDict[hfx+'2-theta'])/2.)**2
    13301330        wave = refl[14+im]
    13311331    else:   #'C'W
     
    19811981                Uniq = np.inner(refl[:3],SGMT)
    19821982                refl[5+im] = GetReflPos(refl,im,0.0,A,pfx,hfx,calcControls,parmDict)         #corrected reflection position
    1983                 Lorenz = sind(parmDict[hfx+'2-theta']/2)*refl[4+im]**4                                                #TOF Lorentz correction
     1983                Lorenz = sind(abs(parmDict[hfx+'2-theta'])/2)*refl[4+im]**4                                                #TOF Lorentz correction
    19841984#                refl[5+im] += GetHStrainShift(refl,im,SGData,phfx,hfx,calcControls,parmDict)               #apply hydrostatic strain shift
    19851985                refl[6+im:8+im] = GetReflSigGamTOF(refl,im,G,GB,phfx,calcControls,parmDict)    #peak sig & gam
Note: See TracChangeset for help on using the changeset viewer.