Changeset 2847
- Timestamp:
- May 31, 2017 11:13:41 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIImath.py
r2846 r2847 184 184 try: 185 185 Ainv = pinv(Amatlam,xtol)[0] #do Moore-Penrose inversion (via SVD) 186 Xvec = np.inner(Ainv,Yvec) #solve187 186 except nl.LinAlgError: 188 print 'ouch #1 '187 print 'ouch #1 bad SVD inversion; change parameterization' 189 188 psing = list(np.where(np.diag(nl.qr(Amatlam)[1]) < 1.e-14)[0]) 190 189 return [x0,None,{'num cyc':icycle,'fvec':M,'nfev':nfev,'lamMax':lamMax,'psing':psing}] 190 Xvec = np.inner(Ainv,Yvec) #solve 191 191 Xvec /= Adiag 192 192 M2 = func(x0+Xvec,*args) -
trunk/GSASIIstrMain.py
r2846 r2847 100 100 covMatrix = result[1]*Rvals['GOF']**2 101 101 sig = np.sqrt(np.diag(covMatrix)) 102 if np.any(np.isnan(sig)) :102 if np.any(np.isnan(sig)) or not sig.shape: 103 103 print '*** Least squares aborted - some invalid esds possible ***' 104 104 # table = dict(zip(varyList,zip(values,result[0],(result[0]-values)/sig))) -
trunk/imports/G2img_1TIF.py
r2835 r2847 24 24 import numpy as np 25 25 import time 26 DEBUG = True26 DEBUG = False 27 27 GSASIIpath.SetVersionNumber("$Revision$") 28 28 class TIF_ReaderClass(G2obj.ImportImage):
Note: See TracChangeset
for help on using the changeset viewer.