Changeset 1461 for trunk/GSASII.py

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:

• trunk/GSASII.py (modified) (1 diff)

trunk/GSASII.py

@@ -1237 +1237 @@
                 cw = np.diff(rd.powderdata[0])
                 rd.powderdata[0] = rd.powderdata[0][:-1]+cw/2.
-                rd.powderdata[1] = rd.powderdata[1][:-1]/cw
-                rd.powderdata[2] = rd.powderdata[2][:-1]*cw**2  #1/var=w at this point
+                if rd.GSAS:     #NB: old GSAS wanted intensities*CW even if normalized!
+                    rd.powderdata[1] = rd.powderdata[1][:-1]/cw
+                    rd.powderdata[2] = rd.powderdata[2][:-1]*cw**2  #1/var=w at this point
+                else:       #NB: from topas/fullprof type files
+                    rd.powderdata[1] = rd.powderdata[1][:-1]
+                    rd.powderdata[2] = rd.powderdata[2][:-1]
                 if 'Itype' in Iparm2:
                     Ibeg = np.searchsorted(rd.powderdata[0],Iparm2['Tminmax'][0])