Changeset 4990

Timestamp:

Jul 4, 2021 9:11:29 AM (21 months ago)

Author:

toby

Message:

renumber ouches to keep unique; give timing on ouch 4

Location:

trunk

Files:

• GSASIImath.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASIImath.py

@@ -318 +318 @@
                     G2fil.G2Print('ouch #4 stuck: chisq-new %.4g > chisq0 %.4g with lambda %.1g'%
                         (chisq1,chisq0,lam), mode='warn')
+                    if GSASIIpath.GetConfigValue('debug'): 
+                        print('Cycle %d: %.2fs' % (icycle,time.time()-time0))
                     try:         # report highly correlated parameters from full Hessian, if we can
                         info = {'num cyc':icycle,'fvec':M,'nfev':nfev,'lamMax':lamMax,
@@ -410 +412 @@
         Bmat = Bmat/Anorm
     except nl.LinAlgError: # this is unexpected. How did we get this far with a singular matrix?
-        G2fil.G2Print('ouch #5 linear algebra error in making final v-cov matrix', mode='error')
+        G2fil.G2Print('ouch #6 linear algebra error in making final v-cov matrix', mode='error')
         psing = list(np.where(np.abs(np.diag(nl.qr(Amat)[1])) < 1.e-14)[0])
         if not len(psing): # make sure at least the worst term is flagged

trunk/GSASIIstrMath.py

@@ -3423 +3423 @@
             MPpool.terminate()
     if badPeak:
-        print ('ouch #4 bad profile coefficients yield negative peak width; some reflections skipped')
+        print ('ouch #7 bad profile coefficients yield negative peak width; some reflections skipped')
     if GSASIIpath.GetConfigValue('Show_timing',False):
         print ('getPowderProfile t=%.3f'%(time.time()-starttime))