Changeset 2847

Timestamp:

May 31, 2017 11:13:41 AM (4 years ago)

Author:

vondreele

Message:

turn off debug in TIF reader
provide better(?) trap for LinAlgErrors? from SVD

Location:

trunk

Files:

• GSASIImath.py (modified) (1 diff)
• GSASIIstrMain.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (1 diff)

trunk/GSASIImath.py

@@ -184 +184 @@
             try:
                 Ainv = pinv(Amatlam,xtol)[0]    #do Moore-Penrose inversion (via SVD)
-                Xvec = np.inner(Ainv,Yvec)      #solve
             except nl.LinAlgError:
-                print 'ouch #1'
+                print 'ouch #1 bad SVD inversion; change parameterization'
                 psing = list(np.where(np.diag(nl.qr(Amatlam)[1]) < 1.e-14)[0])
                 return [x0,None,{'num cyc':icycle,'fvec':M,'nfev':nfev,'lamMax':lamMax,'psing':psing}]
+            Xvec = np.inner(Ainv,Yvec)      #solve
             Xvec /= Adiag
             M2 = func(x0+Xvec,*args)

trunk/GSASIIstrMain.py

@@ -100 +100 @@
             covMatrix = result[1]*Rvals['GOF']**2
             sig = np.sqrt(np.diag(covMatrix))
-            if np.any(np.isnan(sig)):
+            if np.any(np.isnan(sig)) or not sig.shape:
                 print '*** Least squares aborted - some invalid esds possible ***'
 #            table = dict(zip(varyList,zip(values,result[0],(result[0]-values)/sig)))

trunk/imports/G2img_1TIF.py

@@ -24 +24 @@
 import numpy as np
 import time
-DEBUG = True
+DEBUG = False
 GSASIIpath.SetVersionNumber("$Revision$")
 class TIF_ReaderClass(G2obj.ImportImage):