Changeset 482 for trunk/GSASIIpwd.py
- Timestamp:
- Feb 13, 2012 11:33:35 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIpwd.py
r453 r482 11 11 import sys 12 12 import math 13 import wx14 13 import time 15 14 … … 23 22 24 23 import GSASIIpath 25 import GSASIIplot as G2plt26 24 import GSASIIlattice as G2lat 27 25 import GSASIIElem as G2elem … … 945 943 parmdict.update(zip(varylist,values)) 946 944 947 def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,data,oneCycle=False,controls=None ):945 def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,data,oneCycle=False,controls=None,dlg=None): 948 946 949 947 def SetBackgroundParms(Background): … … 1200 1198 values = np.array(Dict2Values(parmDict, varyList)) 1201 1199 if FitPgm == 'LSQ': 1202 dlg = wx.ProgressDialog('Residual','Peak fit Rwp = ',101.0,1203 style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME|wx.PD_CAN_ABORT)1204 screenSize = wx.ClientDisplayRect()1205 Size = dlg.GetSize()1206 dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))1207 1200 try: 1208 1201 result = so.leastsq(errPeakProfile,values,Dfun=devPeakProfile,full_output=True,ftol=Ftol,col_deriv=True,
Note: See TracChangeset
for help on using the changeset viewer.