Changeset 34bbb9c in sasmodels


Ignore:
Timestamp:
Nov 30, 2017 12:33:25 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:
22279a4
Parents:
a66b004
Message:

save before commitgit status

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/weights.py

    ra66b004 r34bbb9c  
    276276    import pylab 
    277277 
    278 <<<<<<< HEAD 
    279     if any(len(dispersity)>1 for value, dispersity, weights in mesh): 
    280         labels = [p.name for p in model_info.parameters.call_parameters] 
    281         #pylab.interactive(True) 
    282         pylab.figure() 
    283         for (v,x,w), s in zip(mesh, labels): 
    284 ======= 
    285278    if any(len(dispersity) > 1 for value, dispersity, weights in mesh): 
    286279        labels = [p.name for p in model_info.parameters.call_parameters] 
     
    288281        pylab.figure() 
    289282        for (v, x, w), s in zip(mesh, labels): 
    290 >>>>>>> master 
    291283            if len(x) > 1: 
    292284                pylab.plot(x, w, '-o', label=s) 
Note: See TracChangeset for help on using the changeset viewer.