Changeset 142a8e2 in sasmodels for sasmodels/core.py

Timestamp:

Sep 5, 2017 8:17:49 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

c11d09f, 3a45c2c, 95468ca

Parents:

2ead7e2 (diff), 34fbbae (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.

git-author:

Paul Butler <butlerpd@…> (09/05/17 08:17:49)

git-committer:

GitHub <noreply@…> (09/05/17 08:17:49)

Message:

Merge pull request #45 from SasView?/simulation

Simulation

File:

• sasmodels/core.py (modified) (1 diff)

sasmodels/core.py

@@ -269 +269 @@
 
     # Convert dtype string to numpy dtype.
-    if dtype is None:
+    if dtype is None or dtype == "default":
         numpy_dtype = (generate.F32 if platform == "ocl" and model_info.single
                        else generate.F64)