Changeset 34bbb9c in sasmodels

Timestamp:

Nov 30, 2017 12:33:25 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:

22279a4

Parents:

a66b004

Message:

save before commitgit status

File:

• sasmodels/weights.py (modified) (2 diffs)

sasmodels/weights.py

@@ -276 +276 @@
     import pylab
 
-<<<<<<< HEAD
-    if any(len(dispersity)>1 for value, dispersity, weights in mesh):
-        labels = [p.name for p in model_info.parameters.call_parameters]
-        #pylab.interactive(True)
-        pylab.figure()
-        for (v,x,w), s in zip(mesh, labels):
-=======
     if any(len(dispersity) > 1 for value, dispersity, weights in mesh):
         labels = [p.name for p in model_info.parameters.call_parameters]
@@ -288 +281 @@
         pylab.figure()
         for (v, x, w), s in zip(mesh, labels):
->>>>>>> master
             if len(x) > 1:
                 pylab.plot(x, w, '-o', label=s)