Changeset 1551 for trunk/GSASIIpwd.py

Timestamp:

Oct 31, 2014 7:08:24 AM (8 years ago)

Author:

vondreele

Message:

fixes to calibration

File:

• trunk/GSASIIpwd.py (modified) (2 diffs)

trunk/GSASIIpwd.py

@@ -1225 +1225 @@
         begin = time.time()
         values =  np.array(Dict2Values(parmDict, varyList))
-        result = so.leastsq(errPeakPos,values,full_output=True,ftol=0.0001,
+        result = so.leastsq(errPeakPos,values,full_output=True,ftol=0.000001,
             args=(peakDsp,peakPos,peakWt,dataType,parmDict,varyList))
         ncyc = int(result[2]['nfev']/2)
@@ -1242 +1242 @@
         except ValueError:          #result[1] is None on singular matrix
             print '**** Refinement failed - singular matrix ****'
-    return True
         
     sigDict = dict(zip(varyList,sig))
     GetInstParms(parmDict,Inst,varyList)
     InstPrint(Inst,sigDict)
+    return True
             
 def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,Inst2,data,prevVaryList=[],oneCycle=False,controls=None,dlg=None):