Changeset 2846 for trunk/GSASIIstrMain.py

Timestamp:

May 30, 2017 4:40:30 PM (6 years ago)

Author:

vondreele

Message:

implement SVD inversion (Moore Penrose invert routine) in Hessian LSQ
clean up commented out code replaced by ValidatedTextCtrl?
set default dM/M to 0.001 (from 0.0001) - more reasonable convergence criterion

File:

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

trunk/GSASIIstrMain.py

@@ -59 +59 @@
         #fl.close()
         Ftol = Controls['min dM/M']
+        Xtol = Controls['SVDtol']
         Factor = Controls['shift factor']
         if 'Jacobian' in Controls['deriv type']:            
@@ -68 +69 @@
             Lamda = Controls.get('Marquardt',-3)
             maxCyc = Controls['max cyc']
-            result = G2mth.HessianLSQ(G2stMth.errRefine,values,Hess=G2stMth.HessRefine,ftol=Ftol,maxcyc=maxCyc,Print=ifPrint,lamda=Lamda,
+            result = G2mth.HessianLSQ(G2stMth.errRefine,values,Hess=G2stMth.HessRefine,ftol=Ftol,xtol=Xtol,maxcyc=maxCyc,Print=ifPrint,lamda=Lamda,
                 args=([Histograms,Phases,restraintDict,rigidbodyDict],parmDict,varyList,calcControls,pawleyLookup,dlg))
             ncyc = result[2]['num cyc']+1