Changeset df776db in sasmodels for sasmodels/kerneldll.py

Timestamp:

Jul 27, 2016 3:56:54 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:

739aad4

Parents:

8357f66 (diff), 63c6a08 (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 'polydisp': adds magnetism; some models still broken

File:

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

sasmodels/kerneldll.py

@@ -272 +272 @@
         # 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.argtypes = argtypes
-        self._Iqxy.argtypes = argtypes
+        names = [generate.kernel_name(self.info, variant)
+                 for variant in ("Iq", "Iqxy", "Imagnetic")]
+        self._kernels = [self._dll[name] for name in names]
+        for k in self._kernels:
+            k.argtypes = argtypes
 
     def __getstate__(self):
@@ -292 +293 @@
         if self._dll is None:
             self._load_dll()
-        kernel = self._Iqxy if q_input.is_2d else self._Iq
+        is_2d = len(q_vectors) == 2
+        kernel = self._kernels[1:3] if is_2d else [self._kernels[0]]*2
         return DllKernel(kernel, self.info, q_input)
 
@@ -343 +345 @@
                      else np.float128)
 
-    def __call__(self, call_details, values, cutoff):
-        # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
-
-        #print("in kerneldll")
-        #print("values", values)
-        start, stop = 0, call_details.pd_prod
+    def __call__(self, call_details, values, cutoff, magnetic):
+        # type: (CallDetails, np.ndarray, np.ndarray, float, bool) -> np.ndarray
+
+        kernel = self.kernel[1 if magnetic else 0]
         args = [
             self.q_input.nq, # nq
-            start, # pd_start
-            stop, # pd_stop pd_stride[MAX_PD]
+            None, # pd_start
+            None, # pd_stop pd_stride[MAX_PD]
             call_details.buffer.ctypes.data, # problem
             values.ctypes.data,  #pars
@@ -358 +358 @@
             self.result.ctypes.data,   # results
             self.real(cutoff), # cutoff
-            ]
-        #print("calling DLL")
-        self.kernel(*args) # type: ignore
-        return self.result[:-1]
+        ]
+        #print("kerneldll values", values)
+        step = 100
+        for start in range(0, call_details.pd_prod, step):
+            stop = min(start+step, call_details.pd_prod)
+            args[1:3] = [start, stop]
+            #print("calling DLL")
+            kernel(*args) # type: ignore
+
+        #print("returned",self.q_input.q, self.result)
+        scale = values[0]/self.result[self.q_input.nq]
+        background = values[1]
+        #print("scale",scale,background)
+        return scale*self.result[:self.q_input.nq] + background
 
     def release(self):