Changeset 5135


Ignore:
Timestamp:
Jan 10, 2022 10:15:57 AM (7 months ago)
Author:
toby
Message:

show that max(shtf/esd) is from all cycles; fix bug for install path w/underscore

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r5118 r5135  
    77267726                    Rvals['Nobs'],Nvars,Rvals.get('SVD0',0.))
    77277727                if Rvals.get('Max shft/sig') is not None:
    7728                     text += '\n\tmax shift/esd = {:.3f}'.format(Rvals['Max shft/sig'])
     7728                    text += '\n\tmax shift/esd = {:.3f} (over all cycles)'.format(Rvals['Max shft/sig'])
    77297729                if 'lamMax' in Rvals:
    77307730                    text += '\n\tlog10 MaxLambda = {:.1f}'.format(np.log10(Rvals['lamMax']))
  • trunk/GSASIIpath.py

    r5132 r5135  
    10811081        versions = {}
    10821082        for d in glob.glob(os.path.join(loc,'AllBinaries',binprfx+'*')):
    1083             v = intver(d.rstrip('/').split('_')[3].lstrip('n'))
     1083            v = intver(d.rstrip('/').split('_')[-1].lstrip('n'))
    10841084            versions[v] = d
    10851085        searchpathlist = [os.path.join(loc,'bin')]
  • trunk/GSASIIstrMain.py

    r5117 r5135  
    217217                ncyc = int(result[2]['nfev']/len(varyList))
    218218            if refPlotUpdate is not None: refPlotUpdate(Histograms)   # update plot
    219 #        table = dict(zip(varyList,zip(values,result[0],(result[0]-values))))
    220 #        for item in table: print item,table[item]               #useful debug - are things shifting?
     219        #table = dict(zip(varyList,zip(values,result[0],(result[0]-values))))
     220        #for item in table: print(item,table[item])               #useful debug - are things shifting?
    221221        runtime = time.time()-begin
    222222        Rvals['SVD0'] = result[2].get('SVD0',0)
     
    260260            sig = np.sqrt(np.diag(covMatrix))
    261261            Lastshft = result[0]-values     #NOT last shift since values is starting set before current refinement
     262            #table = dict(zip(varyList,zip(values,result[0],Lastshft,Lastshft/sig)))
     263            #for item in table: print(item,table[item])               #useful debug
    262264            Rvals['Max shft/sig'] = np.max(np.nan_to_num(Lastshft/sig))
    263265            if np.any(np.isnan(sig)) or not sig.shape:
    264266                G2fil.G2Print ('*** Least squares aborted - some invalid esds possible ***',mode='error')
     267            else:
     268                print('Maximum shift/esd = {:.3f} for all cycles'
     269                          .format(Rvals['Max shft/sig']))
    265270            # report on refinement issues. Result in Rvals['msg']
    266271            ReportProblems(result,Rvals,varyList)
Note: See TracChangeset for help on using the changeset viewer.