Changeset 32e3c9b in sasmodels for sasmodels/kernelcl.py

Timestamp:

Jul 21, 2016 2: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/kernelcl.py (modified) (3 diffs)

sasmodels/kernelcl.py

@@ -385 +385 @@
         self.program = None
 
-    def make_kernel(self, q_vectors):
+    def make_kernel(self, q_vectors, magnetic=False):
         # type: (List[np.ndarray]) -> "GpuKernel"
         if self.program is None:
@@ -392 +392 @@
                                     self.dtype, self.fast)
         is_2d = len(q_vectors) == 2
-        kernel_name = generate.kernel_name(self.info, is_2d)
+        variant = "Imagnetic" if magnetic else "Iqxy" if is_2d else "Iq"
+        kernel_name = generate.kernel_name(self.info, variant)
         kernel = getattr(self.program, kernel_name)
         return GpuKernel(kernel, self.dtype, self.info, q_vectors)
@@ -519 +520 @@
                      else np.float32)  # will never get here, so use np.float32
 
-    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
         context = self.queue.context
         # Arrange data transfer to card