Changeset 12076cf in sasmodels

Timestamp:

Feb 19, 2015 10:50:16 AM (9 years ago)

Author:

ajj

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

8221f1c

Parents:

51bfbeb (diff), c9801b8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• direct_model.py (added)
• generate.py (modified) (1 diff)
• models/broad_peak.py (added)
• models/hardsphere.py (added)
• models/img/hardSphere_223.PNG (added)
• models/img/hardSphere_224.jpg (added)

sasmodels/generate.py

@@ -732 +732 @@
     info['limits'] = dict((p[0],p[3]) for p in info['parameters'])
     info['partype'] = categorize_parameters(info['parameters'])
+    info['defaults'] = dict((p[0],p[2]) for p in info['parameters'])
 
     source = make_model(info)