Changeset 92d38285 in sasmodels

Timestamp:

Jun 22, 2016 10:13:32 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:

b3a85cd

Parents:

f5dde3f

Message:

manage set of models loaded by sasview; support loading sasview sum model

File:

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

sasmodels/sasview_model.py

@@ -5 +5 @@
 create a sasview model class to run that kernel as follows::
 
-    from sasmodels.sasview_model import make_class
-    from sasmodels.models import cylinder
-    CylinderModel = make_class(cylinder, dtype='single')
-
-The model parameters for sasmodels are different from those in sasview.
-When reloading previously saved models, the parameters should be converted
-using :func:`sasmodels.convert.convert`.
+    from sasmodels.sasview_model import load_custom_model
+    CylinderModel = load_custom_model('sasmodels/models/cylinder.py')
 """
 from __future__ import print_function
@@ -44 +39 @@
 )
 
+MODELS = {}
+def find_model(modelname):
+    # TODO: used by sum/product model to load an existing model
+    # TODO: doesn't handle custom models properly
+    if modelname.endswith('.py'):
+        return load_custom_model(modelname)
+    elif modelname in MODELS:
+        return MODELS[modelname]
+    else:
+        raise ValueError("unknown model %r"%modelname)
+
 def load_standard_models():
     """
@@ -54 +60 @@
     for name in core.list_models():
         try:
-            models.append(_make_standard_model(name))
-        except:
+            MODELS[name] = _make_standard_model(name)
+            models.append(MODELS[name])
+        except Exception:
             logging.error(traceback.format_exc())
     return models
@@ -64 +71 @@
     Load a custom model given the model path.
     """
+    #print("load custom model", path)
     kernel_module = custom.load_custom_kernel_module(path)
-    model_info = generate.make_model_info(kernel_module)
-    return _make_model_from_info(model_info)
+    try:
+        model = kernel_module.Model
+    except AttributeError:
+        model_info = generate.make_model_info(kernel_module)
+        model = _make_model_from_info(model_info)
+    MODELS[model.name] = model
+    return model