Changeset 502c7b8 in sasmodels for sasmodels/core.py

Timestamp:

Aug 7, 2018 5:14:59 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

7b0abf8

Parents:

cdd676e (diff), 01c8d9e (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 'greg/beta_approx' into beta_approx

File:

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

sasmodels/core.py

@@ -140 +140 @@
     used with functions in generate to build the docs or extract model info.
     """
+
     if "+" in model_string:
         parts = [load_model_info(part)
@@ -205 +206 @@
 
     numpy_dtype, fast, platform = parse_dtype(model_info, dtype, platform)
-
     source = generate.make_source(model_info)
     if platform == "dll":
@@ -265 +265 @@
     # Assign default platform, overriding ocl with dll if OpenCL is unavailable
     # If opencl=False OpenCL is switched off
-
     if platform is None:
         platform = "ocl"
@@ -291 +290 @@
     else:
         numpy_dtype = np.dtype(dtype)
-
     # Make sure that the type is supported by opencl, otherwise use dll
     if platform == "ocl":