Changeset 9bc4882 in sasmodels for sasmodels/kernelpy.py

Timestamp:

Sep 5, 2017 11:01:03 AM (7 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:

8db25bf

Parents:

acc6c8f (diff), 142a8e2 (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 branch 'master' into ticket-776-orientation

File:

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

sasmodels/kernelpy.py

@@ -9 +9 @@
 from __future__ import division, print_function
 
+import logging
+
 import numpy as np  # type: ignore
 from numpy import pi, sin, cos  #type: ignore
@@ -18 +20 @@
 try:
     from typing import Union, Callable
-except:
+except ImportError:
     pass
 else:
@@ -31 +33 @@
         _create_default_functions(model_info)
         self.info = model_info
+        self.dtype = np.dtype('d')
 
     def make_kernel(self, q_vectors):
+        logging.info("creating python kernel " + self.info.name)
         q_input = PyInput(q_vectors, dtype=F64)
         kernel = self.info.Iqxy if q_input.is_2d else self.info.Iq
@@ -228 +232 @@
             # INVALID expression like the C models, but that is too expensive.
             Iq = np.asarray(form(), 'd')
-            if np.isnan(Iq).any(): continue
+            if np.isnan(Iq).any():
+                continue
 
             # update value and norm
@@ -291 +296 @@
         default_Iqxy.vectorized = True
         model_info.Iqxy = default_Iqxy
-