Changeset 793beb3 in sasmodels for sasmodels/sasview_model.py

Timestamp:

Apr 13, 2016 10:02:03 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

a18c5b3

Parents:

04045f4 (diff), 81ec7c8 (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 remote-tracking branch 'remotes/origin/master' into polydisp

Conflicts:

sasmodels/generate.py
sasmodels/sasview_model.py

File:

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

sasmodels/sasview_model.py

@@ -115 +115 @@
     attrs['_model_info'] = model_info
     attrs['name'] = model_info.name
+    attrs['id'] = model_info.id
     attrs['description'] = model_info.description
     attrs['category'] = None