Changeset 2928


Ignore:
Timestamp:
Jul 12, 2017 1:08:49 PM (4 years ago)
Author:
toby
Message:

fix seq. ref. window; screen positioning bug; read of multiple data files after use of defaults parms

Location:
branch/2frame
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branch/2frame/GSASIIpwd.py

    r2849 r2928  
    681681               
    682682def getFCJVoigt(pos,intens,sig,gam,shl,xdata):   
    683     'needs a doc string'
     683    '''Compute the Finger-Cox-Jepcoat modified Voigt function for a
     684    CW powder peak by direct convolution. This version is not used.
     685    '''
    684686    DX = xdata[1]-xdata[0]
    685687    widths,fmin,fmax = getWidthsCW(pos,sig,gam,shl)
     
    953955#use old fortran routine
    954956def getFCJVoigt3(pos,sig,gam,shl,xdata):
    955     'needs a doc string'
     957    '''Compute the Finger-Cox-Jepcoat modified Pseudo-Voigt function for a
     958    CW powder peak in external Fortran routine
     959    '''
    956960    Df = pyd.pypsvfcj(len(xdata),xdata-pos,pos,sig,gam,shl)
    957961#    Df = pyd.pypsvfcjo(len(xdata),xdata-pos,pos,sig,gam,shl)
     
    960964
    961965def getdFCJVoigt3(pos,sig,gam,shl,xdata):
    962     'needs a doc string'
    963    
     966    '''Compute analytic derivatives the Finger-Cox-Jepcoat modified Pseudo-Voigt
     967    function for a CW powder peak
     968    '''
    964969    Df,dFdp,dFds,dFdg,dFdsh = pyd.pydpsvfcj(len(xdata),xdata-pos,pos,sig,gam,shl)
    965970#    Df,dFdp,dFds,dFdg,dFdsh = pyd.pydpsvfcjo(len(xdata),xdata-pos,pos,sig,gam,shl)
  • branch/2frame/GSASIIstrMain.py

    r2924 r2928  
    2121import scipy.optimize as so
    2222import GSASIIpath
     23GSASIIpath.SetBinaryPath()
    2324GSASIIpath.SetVersionNumber("$Revision$")
    2425import GSASIIlattice as G2lat
     
    767768         
    768769if __name__ == '__main__':
    769     GSASIIpath.SetBinaryPath()
    770770    main()
Note: See TracChangeset for help on using the changeset viewer.