Changeset bcd3aa3 in sasmodels

Timestamp:

Mar 23, 2015 3:48:28 PM (10 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:

0a33675

Parents:

7954f5c

Message:

simplify core model loader interface so model can be loaded directly from model name

File:

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

sasmodels/core.py

@@ -60 +60 @@
 
 
+def isstr(s):
+    try: s + ''
+    except: return False
+    return True
+
 def load_model(model_definition, dtype="single", platform="ocl"):
     """
@@ -66 +71 @@
     This will return an OpenCL model, a DLL model or a python model depending
     on the model and the computing platform.
+
+    *model_definition* is the python module which defines the model.  If the
+    model name is given instead, then :func:`load_model_definition` will be
+    called with the model name.
 
     *dtype* indicates whether the model should use single or double precision
@@ -75 +84 @@
     otherwise it uses the default "ocl".
     """
+    if isstr(model_definition):
+        model_definition = load_model_definition(model_definition)
     source, info = generate.make(model_definition)
     if callable(info.get('Iq', None)):