Changeset 1461 for trunk/GSASII.py


Ignore:
Timestamp:
Aug 13, 2014 3:59:09 PM (8 years ago)
Author:
vondreele
Message:

modify xye import to not divide by CW (channel width)for TOF data. NB: old style GSAS data is *CW for use in GSAS - need to divide by CW to remove it.
implement spin buttons for lattice parms - get auto update of index peak positions.
fix Refine problem if nothing refined. Now works OK as a profile calculator with no refinement.
More fixes to TOF function & derivatives..

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1459 r1461  
    12371237                cw = np.diff(rd.powderdata[0])
    12381238                rd.powderdata[0] = rd.powderdata[0][:-1]+cw/2.
    1239                 rd.powderdata[1] = rd.powderdata[1][:-1]/cw
    1240                 rd.powderdata[2] = rd.powderdata[2][:-1]*cw**2  #1/var=w at this point
     1239                if rd.GSAS:     #NB: old GSAS wanted intensities*CW even if normalized!
     1240                    rd.powderdata[1] = rd.powderdata[1][:-1]/cw
     1241                    rd.powderdata[2] = rd.powderdata[2][:-1]*cw**2  #1/var=w at this point
     1242                else:       #NB: from topas/fullprof type files
     1243                    rd.powderdata[1] = rd.powderdata[1][:-1]
     1244                    rd.powderdata[2] = rd.powderdata[2][:-1]
    12411245                if 'Itype' in Iparm2:
    12421246                    Ibeg = np.searchsorted(rd.powderdata[0],Iparm2['Tminmax'][0])
Note: See TracChangeset for help on using the changeset viewer.