Changeset fa5fd8d in sasmodels for sasmodels/core.py

Timestamp:

Apr 12, 2016 4:02:41 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:

04045f4

Parents:

7ae2b7f

Message:

support number of shells selection in sasview wrapper for onion model

File:

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

sasmodels/core.py

@@ -102 +102 @@
 
 def build_model(model_info, dtype=None, platform="ocl"):
-    # type: (modelinfo.ModelInfo, DType, str) -> KernelModel
+    # type: (modelinfo.ModelInfo, np.dtype, str) -> KernelModel
     """
     Prepare the model for the default execution platform.
@@ -134 +134 @@
             raise ValueError('unknown mixture type %s'%composition_type)
 
+    # If it is a python model, return it immediately
+    if callable(model_info.Iq):
+        return kernelpy.PyModel(model_info)
+
     ## for debugging:
     ##  1. uncomment open().write so that the source will be saved next time
@@ -144 +148 @@
     source = generate.make_source(model_info)
     if dtype is None:
-        dtype = 'single' if model_info.single else 'double'
-    if callable(model_info.Iq):
-        return kernelpy.PyModel(model_info)
+        dtype = generate.F32 if model_info.single else generate.F64
     if (platform == "dll"
             or not HAVE_OPENCL