Changeset a4280bd in sasmodels for sasmodels/core.py

Timestamp:

Jul 25, 2016 11:54:30 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:

2f5c6d4

Parents:

2c74c11

Message:

restructure magnetic models to use less code

File:

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

sasmodels/core.py

@@ -144 +144 @@
     if platform == "dll":
         #print("building dll", numpy_dtype)
-        return kerneldll.load_dll(source, model_info, numpy_dtype)
+        return kerneldll.load_dll(source['dll'], model_info, numpy_dtype)
     else:
         #print("building ocl", numpy_dtype)
@@ -166 +166 @@
     for model_name in list_models():
         model_info = load_model_info(model_name)
-        source = generate.make_source(model_info)
-        if source:
+        if not callable(model_info.Iq):
+            source = generate.make_source(model_info)['dll']
             old_path = kerneldll.DLL_PATH
             try: