Changeset 3913 for trunk/GSASIImath.py

Timestamp:

Apr 21, 2019 10:05:23 PM (4 years ago)

Author:

toby

Message:

Update Rietveld cycle-by-cycle

File:

• trunk/GSASIImath.py (modified) (4 diffs)

trunk/GSASIImath.py

@@ -99 +99 @@
     return res,nzero
 
-def HessianLSQ(func,x0,Hess,args=(),ftol=1.49012e-8,xtol=1.e-6, maxcyc=0,lamda=-3,Print=False):
-    
+def HessianLSQ(func,x0,Hess,args=(),ftol=1.49012e-8,xtol=1.e-6, maxcyc=0,lamda=-3,Print=False,refPlotUpdate=None):
     """
     Minimize the sum of squares of a function (:math:`f`) evaluated on a series of
@@ -209 +208 @@
             print (' Cycle: %d, Time: %.2fs, Chi**2: %.5g for %d obs., Lambda: %.3g,  Delta: %.3g'%(
                 icycle,time.time()-time0,chisq1,Nobs,lamMax,deltaChi2))
+        Histograms = args[0][0]
+        if refPlotUpdate is not None: refPlotUpdate(Histograms,icycle)   # update plot
         if deltaChi2 < ftol:
             ifConverged = True
@@ -233 +234 @@
         return [x0,None,{'num cyc':icycle,'fvec':M,'nfev':nfev,'lamMax':lamMax,'psing':psing,'SVD0':-1}]          
             
-def HessianSVD(func,x0,Hess,args=(),ftol=1.49012e-8,xtol=1.e-6, maxcyc=0,lamda=-3,Print=False):
+def HessianSVD(func,x0,Hess,args=(),ftol=1.49012e-8,xtol=1.e-6, maxcyc=0,lamda=-3,Print=False,refPlotUpdate=None):
     
     """
@@ -319 +320 @@
             print (' Cycle: %d, Time: %.2fs, Chi**2: %.5g, Delta: %.3g'%(
                 icycle,time.time()-time0,chisq1,deltaChi2))
+        Histograms = args[0][0]
+        if refPlotUpdate is not None: refPlotUpdate(Histograms,icycle)   # update plot
         if deltaChi2 < ftol:
             ifConverged = True