Changeset 4d76711 in sasmodels for sasmodels/core.py

Timestamp:

Apr 5, 2016 10:33:44 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:

3a45c2c, c4e7a5f

Parents:

cd0a808

Message:

adjust interface to sasview

File:

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

sasmodels/core.py

@@ -7 +7 @@
     ]
 
-
 from os.path import basename, dirname, join as joinpath, splitext
 from glob import glob
-import imp
 
 import numpy as np
@@ -40 +38 @@
             return [np.asarray(v) for v in args]
 
+# TODO: refactor composite model support
+# The current load_model_info/build_model does not reuse existing model
+# definitions when loading a composite model, instead reloading and
+# rebuilding the kernel for each component model in the expression.  This
+# is fine in a scripting environment where the model is built when the script
+# starts and is thrown away when the script ends, but may not be the best
+# solution in a long-lived application.  This affects the following functions:
+#
+#    load_model
+#    load_model_info
+#    build_model
 
 def list_models():
@@ -64 +73 @@
     return build_model(load_model_info(model_name), **kw)
 
-def load_model_info_from_path(path):
-    # Pull off the last .ext if it exists; there may be others
-    name = basename(splitext(path)[0])
-
-    # Not cleaning name since don't need to be able to reload this
-    # model later
-    # Should probably turf the model from sys.modules after we are done...
-
-    # Placing the model in the 'sasmodels.custom' name space, even
-    # though it doesn't actually exist.  imp.load_source doesn't seem
-    # to care.
-    kernel_module = imp.load_source('sasmodels.custom.'+name, path)
-
-    # Now that we have the module, we can load it as usual
-    model_info = generate.make_model_info(kernel_module)
-    return model_info
 
 def load_model_info(model_name):
@@ -102 +95 @@
         return product.make_product_info(P_info, Q_info)
 
-    #import sys; print "\n".join(sys.path)
-    __import__('sasmodels.models.'+model_name)
-    kernel_module = getattr(models, model_name, None)
+    kernel_module = generate.load_kernel_module(model_name)
     return generate.make_model_info(kernel_module)
 
@@ -179 +170 @@
 
 
-def make_kernel(model, q_vectors):
-    """
-    Return a computation kernel from the model definition and the q input.
-    """
-    return model(q_vectors)
-
 def get_weights(model_info, pars, name):
     """
@@ -220 +205 @@
 def call_kernel(kernel, pars, cutoff=0, mono=False):
     """
-    Call *kernel* returned from :func:`make_kernel` with parameters *pars*.
+    Call *kernel* returned from *model.make_kernel* with parameters *pars*.
 
     *cutoff* is the limiting value for the product of dispersion weights used
@@ -228 +213 @@
     with an error of about 1%, which is usually less than the measurement
     uncertainty.
+
+    *mono* is True if polydispersity should be set to none on all parameters.
     """
     fixed_pars = [pars.get(name, kernel.info['defaults'][name])
@@ -259 +246 @@
 
 
-def call_ER(info, pars):
-    """
-    Call the model ER function using *pars*.
-    *info* is either *model.info* if you have a loaded model, or *kernel.info*
-    if you have a model kernel prepared for evaluation.
-    """
-    ER = info.get('ER', None)
+def call_ER(model_info, values):
+    """
+    Call the model ER function using *values*. *model_info* is either
+    *model.info* if you have a loaded model, or *kernel.info* if you
+    have a model kernel prepared for evaluation.
+    """
+    ER = model_info.get('ER', None)
     if ER is None:
         return 1.0
     else:
-        vol_pars = [get_weights(info, pars, name)
-                    for name in info['partype']['volume']]
+        vol_pars = [get_weights(model_info, values, name)
+                    for name in model_info['partype']['volume']]
         value, weight = dispersion_mesh(vol_pars)
         individual_radii = ER(*value)
@@ -276 +263 @@
         return np.sum(weight*individual_radii) / np.sum(weight)
 
-def call_VR(info, pars):
+def call_VR(model_info, values):
     """
     Call the model VR function using *pars*.
@@ -282 +269 @@
     if you have a model kernel prepared for evaluation.
     """
-    VR = info.get('VR', None)
+    VR = model_info.get('VR', None)
     if VR is None:
         return 1.0
     else:
-        vol_pars = [get_weights(info, pars, name)
-                    for name in info['partype']['volume']]
+        vol_pars = [get_weights(model_info, values, name)
+                    for name in model_info['partype']['volume']]
         value, weight = dispersion_mesh(vol_pars)
         whole, part = VR(*value)