Changeset 9457498 in sasmodels

Timestamp:

Aug 8, 2016 8:32:13 PM (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:

3a45c2c

Parents:

2472141

Message:

support old style custom formula models (but not sum or product)

File:

• sasmodels/sasview_model.py (modified) (3 diffs)

sasmodels/sasview_model.py

@@ -15 +15 @@
 import traceback
 import logging
+from os.path import basename, splitext
 
 import numpy as np  # type: ignore
+
+# Monkey patch sas.sascalc.fit as sas.models so that sas.models.pluginmodel
+# is available to the plugin modules.
+import sys
+import sas
+import sas.sascalc.fit
+sys.modules['sas.models'] = sas.sascalc.fit
+sas.models = sas.sascalc.fit
 
 from . import core
@@ -37 +46 @@
     pass
 
+
 # TODO: separate x_axis_label from multiplicity info
 MultiplicityInfo = collections.namedtuple(
@@ -84 +94 @@
     Load a custom model given the model path.
     """
-    #print("load custom model", path)
     kernel_module = custom.load_custom_kernel_module(path)
     try:
         model = kernel_module.Model
+        # Old style models do not set the name in the class attributes, so
+        # set it here; this name will be overridden when the object is created
+        # with an instance variable that has the same value.
+        if model.name == "":
+            model.name = splitext(basename(path))[0]
     except AttributeError:
         model_info = modelinfo.make_model_info(kernel_module)