Changeset 530 for trunk/GSASIImath.py
 Timestamp:
 Apr 6, 2012 1:30:45 PM (11 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIImath.py
r486 r530 91 91 lamMax = lam 92 92 nfev = 0 93 while icycle < =maxcyc:93 while icycle < maxcyc: 94 94 lamMax = max(lamMax,lam) 95 95 M = func(x0,*args) … … 131 131 Bmat = nl.inv(Amat) 132 132 return [x0,Bmat,{'num cyc':icycle,'fvec':M,'nfev':nfev,'lamMax':lamMax,'psing':[]}] 133 except LinAlgError: 134 psing = list(np.where(np.diag(nl.gr(Amat)[1]) < 1.e14)[0]) 133 except nl.LinAlgError: 134 psing = [] 135 if maxcyc: 136 psing = list(np.where(np.diag(nl.qr(Amat)[1]) < 1.e14)[0]) 135 137 return [x0,None,{'num cyc':icycle,'fvec':M,'nfev':nfev,'lamMax':lamMax,'psing':psing}] 136 137 def calcFouriermap(): 138 print 'Calculate Fourier map' 139 140 138 141 139 def getVCov(varyNames,varyList,covMatrix): 142 140 vcov = np.zeros((len(varyNames),len(varyNames)))
Note: See TracChangeset
for help on using the changeset viewer.