Changeset 5b0335b in sasmodels for sasmodels/core.py

Timestamp:

Apr 4, 2016 9:36:11 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:

68e7f9d

Parents:

885ee37 (diff), 204fd9b (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 remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/core.py
sasmodels/models/spherical_sld.py

File:

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

sasmodels/core.py

@@ -2 +2 @@
 Core model handling routines.
 """
+__all__ = [
+    "list_models", "load_model_info", "precompile_dll",
+    "build_model", "make_kernel", "call_kernel", "call_ER_VR",
+    ]
 
 from os.path import basename, dirname, join as joinpath, splitext
@@ -39 +43 @@
         return module
 
-
-
-__all__ = [
-    "list_models", "load_model_info", "precompile_dll",
-    "build_model", "call_kernel", "call_ER_VR",
-]
+try:
+    np.meshgrid([])
+    meshgrid = np.meshgrid
+except ValueError:
+    # CRUFT: np.meshgrid requires multiple vectors
+    def meshgrid(*args):
+        if len(args) > 1:
+            return np.meshgrid(*args)
+        else:
+            return [np.asarray(v) for v in args]
 
 def list_models():
@@ -90 +98 @@
         return product.make_product_info(P_info, Q_info)
 
-    return make_model_by_name(model_name)
-
-
-def make_model_by_name(model_name):
+    kernel_module = load_kernel_module(model_name)
+    return generate.make_model_info(kernel_module)
+
+
+def load_kernel_module(model_name):
     if model_name.endswith('.py'):
         path = model_name
@@ -106 +115 @@
         kernel_module = getattr(models, model_name, None)
     #import sys; print "\n".join(sys.path)
-    return generate.make_model_info(kernel_module)
+    __import__('sasmodels.models.'+model_name)
+    kernel_module = getattr(models, model_name, None)
+    return kernel_module
 
 
@@ -210 +221 @@
     """
     value, weight = zip(*pars)
-    value = [v.flatten() for v in np.meshgrid(*value)]
-    weight = np.vstack([v.flatten() for v in np.meshgrid(*weight)])
+    value = [v.flatten() for v in meshgrid(*value)]
+    weight = np.vstack([v.flatten() for v in meshgrid(*weight)])
     weight = np.prod(weight, axis=0)
     return value, weight