Changeset a5b8477 in sasmodels for sasmodels/kerneldll.py

Timestamp:

Apr 13, 2016 8:17:10 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:

0ce5710

Parents:

60f03de

Message:

update docs to work with the new ModelInfo/ParameterTable? classes

File:

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

sasmodels/kerneldll.py

@@ -55 +55 @@
 
 from . import generate
-from . import details
 from .kernel import KernelModel, Kernel
 from .kernelpy import PyInput
@@ -279 +278 @@
         self.dtype = q_input.dtype
         self.dim = '2d' if q_input.is_2d else '1d'
-        self.result = np.empty(q_input.nq+3, q_input.dtype)
+        self.result = np.empty(q_input.nq+1, q_input.dtype)
+        self.real = (np.float32 if self.q_input.dtype == generate.F32
+                     else np.float64 if self.q_input.dtype == generate.F64
+                     else np.float128)
 
     def __call__(self, call_details, weights, values, cutoff):
         # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
-        real = (np.float32 if self.q_input.dtype == generate.F32
-                else np.float64 if self.q_input.dtype == generate.F64
-                else np.float128)
-        assert isinstance(call_details, details.CallDetails)
-        assert weights.dtype == real and values.dtype == real
-
-        start, stop = 0, call_details.total_pd
+
         #print("in kerneldll")
         #print("weights", weights)
         #print("values", values)
+        start, stop = 0, call_details.total_pd
         args = [
             self.q_input.nq, # nq
@@ -302 +299 @@
             self.q_input.q.ctypes.data, #q
             self.result.ctypes.data,   # results
-            real(cutoff), # cutoff
+            self.real(cutoff), # cutoff
             ]
         self.kernel(*args) # type: ignore
-        return self.result[:-3]
+        return self.result[:-1]
 
     def release(self):