Changeset 34823bc in sasmodels


Ignore:
Timestamp:
Oct 23, 2017 9:57:28 AM (6 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
59e537a
Parents:
a1c5758
Message:

save before committing next time…

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/compare.py

    ra1c5758 r34823bc  
    991991            err[err > cutoff] = cutoff 
    992992        #err,errstr = base/comp,"ratio" 
    993 <<<<<<< HEAD 
    994993        plot_theory(data, None, resid=err, view=errview, use_data=use_data) 
    995994        plt.xscale('log' if view == 'log' else linear) 
    996995        plt.legend(['P%d'%(k+1) for k in range(setnum+1)], loc='best') 
    997 ======= 
    998         plot_theory(data, None, resid=err, view=view, use_data=use_data) 
    999         plt.yscale(errview) 
    1000 >>>>>>> master 
    1001996        plt.title("max %s = %.3g"%(errstr, abs(err).max())) 
    1002997        #cbar_title = errstr if errview=="linear" else "log "+errstr 
Note: See TracChangeset for help on using the changeset viewer.