Changeset 34823bc in sasmodels

Timestamp:

Oct 23, 2017 11:57:28 AM (7 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:

• sasmodels/compare.py (modified) (1 diff)

sasmodels/compare.py

@@ -991 +991 @@
             err[err > cutoff] = cutoff
         #err,errstr = base/comp,"ratio"
-<<<<<<< HEAD
         plot_theory(data, None, resid=err, view=errview, use_data=use_data)
         plt.xscale('log' if view == 'log' else linear)
         plt.legend(['P%d'%(k+1) for k in range(setnum+1)], loc='best')
-=======
-        plot_theory(data, None, resid=err, view=view, use_data=use_data)
-        plt.yscale(errview)
->>>>>>> master
         plt.title("max %s = %.3g"%(errstr, abs(err).max()))
         #cbar_title = errstr if errview=="linear" else "log "+errstr