Changeset 32e3c9b in sasmodels for sasmodels/kerneldll.py

Timestamp:

Jul 21, 2016 4:08:04 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:

b966a96

Parents:

42356c8

Message:

dll version of magnetic sld

File:

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

sasmodels/kerneldll.py

@@ -270 +270 @@
         # int, int, int, int*, double*, double*, double*, double*, double
         argtypes = [c_int32]*3 + [c_void_p]*4 + [fp]
-        self._Iq = self._dll[generate.kernel_name(self.info, is_2d=False)]
-        self._Iqxy = self._dll[generate.kernel_name(self.info, is_2d=True)]
+        self._Iq = self._dll[generate.kernel_name(self.info, "Iq")]
+        self._Iqxy = self._dll[generate.kernel_name(self.info, "Iqxy")]
+        self._Imagnetic = self._dll[generate.kernel_name(self.info, "Imagnetic")]
         self._Iq.argtypes = argtypes
         self._Iqxy.argtypes = argtypes
+        self._Imagnetic.argtypes = argtypes
 
     def __getstate__(self):
@@ -284 +286 @@
         self._dll = None
 
-    def make_kernel(self, q_vectors):
+    def make_kernel(self, q_vectors, magnetic=False):
         # type: (List[np.ndarray]) -> DllKernel
         q_input = PyInput(q_vectors, self.dtype)
@@ -290 +292 @@
         if self._dll is None:
             self._load_dll()
-        kernel = self._Iqxy if q_input.is_2d else self._Iq
+        kernel = [self._Iqxy, self._Imagnetic] if q_input.is_2d else self._Iq
         return DllKernel(kernel, self.info, q_input)
 
@@ -341 +343 @@
                      else np.float128)
 
-    def __call__(self, call_details, values, cutoff):
-        # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
+    def __call__(self, call_details, values, cutoff, magnetic):
+        # type: (CallDetails, np.ndarray, np.ndarray, float, bool) -> np.ndarray
 
         #print("in kerneldll")
@@ -358 +360 @@
             ]
         #print("calling DLL")
-        self.kernel(*args) # type: ignore
+        self.kernel[1 if magnetic else 0](*args) # type: ignore
         return self.result[:-1]