Changeset 4990


Ignore:
Timestamp:
Jul 4, 2021 9:11:29 AM (5 months ago)
Author:
toby
Message:

renumber ouches to keep unique; give timing on ouch 4

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIImath.py

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

    r4981 r4990  
    34233423            MPpool.terminate()
    34243424    if badPeak:
    3425         print ('ouch #4 bad profile coefficients yield negative peak width; some reflections skipped')
     3425        print ('ouch #7 bad profile coefficients yield negative peak width; some reflections skipped')
    34263426    if GSASIIpath.GetConfigValue('Show_timing',False):
    34273427        print ('getPowderProfile t=%.3f'%(time.time()-starttime))
Note: See TracChangeset for help on using the changeset viewer.