Changeset 2600 for trunk/GSASIIpwd.py


Ignore:
Timestamp:
Dec 22, 2016 11:14:21 AM (5 years ago)
Author:
vondreele
Message:

remove comment about mag structures under construction
set powder peak widths to be 50*FWHM for TOF & 75/50 for CW (bigger on low side for axial divergence)
Tune up density map color rendering - make "red" really orange (brighter) & both orange/green more intense.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r2597 r2600  
    539539def getWidthsCW(pos,sig,gam,shl):
    540540    '''Compute the peak widths used for computing the range of a peak
    541     for constant wavelength data. On low-angle side, 10 FWHM are used,
    542     on high-angle side 15 are used, low angle side extended by axial divergence
     541    for constant wavelength data. On low-angle side, 50 FWHM are used,
     542    on high-angle side 75 are used, low angle side extended for axial divergence
    543543    (for peaks above 90 deg, these are reversed.)
    544544    '''
    545545    widths = [np.sqrt(sig)/100.,gam/100.]
    546546    fwhm = 2.355*widths[0]+widths[1]
    547     fmin = 100.*(fwhm+shl*abs(npcosd(pos)))
    548     fmax = 150.0*fwhm
     547    fmin = 50.*(fwhm+shl*abs(npcosd(pos)))
     548    fmax = 75.0*fwhm
    549549    if pos > 90:
    550550        fmin,fmax = [fmax,fmin]         
     
    553553def getWidthsTOF(pos,alp,bet,sig,gam):
    554554    '''Compute the peak widths used for computing the range of a peak
    555     for constant wavelength data. 10 FWHM are used on both sides each
     555    for constant wavelength data. 50 FWHM are used on both sides each
    556556    extended by exponential coeff.
    557557    '''
    558558    widths = [np.sqrt(sig),gam]
    559559    fwhm = 2.355*widths[0]+2.*widths[1]
    560     fmin = 30.*fwhm*(1.+1./alp)   
    561     fmax = 30.*fwhm*(1.+1./bet)
     560    fmin = 50.*fwhm*(1.+1./alp)   
     561    fmax = 50.*fwhm*(1.+1./bet)
    562562    return widths,fmin,fmax
    563563   
Note: See TracChangeset for help on using the changeset viewer.