Changeset be3cce9 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Sep 11, 2017 5:15:05 AM (7 years ago)

Author:

lewis

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6726fb9

Parents:

a85a569 (diff), ab60822 (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' into ticket-767

File:

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

sasmodels/modelinfo.py

@@ -727 +727 @@
     models when the model is first called, not when the model is loaded.
     """
+    if hasattr(kernel_module, "model_info"):
+        # Custom sum/multi models
+        return kernel_module.model_info
     info = ModelInfo()
     #print("make parameter table", kernel_module.parameters)