Changeset 39cc3be in sasmodels

Timestamp:

Mar 21, 2016 7:05:29 AM (9 years ago)

Author:

wojciech

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:

a6f9577

Parents:

9f51b0e

Message:

Calling order paramtere clean up

Location:

sasmodels

Files:

• core.py (modified) (2 diffs)
• kernel_iq.c (modified) (1 diff)
• kerneldll.py (modified) (3 diffs)

sasmodels/core.py

@@ -223 +223 @@
     if mono or True:
         pars = np.array([values.get(p.name, p.default)
-                         for p in kernel.info['parameters']])
-        weights = np.array([1.0])
+                         for p in kernel.info['parameters']],
+                        dtype=kernel.dtype)
+        weights = np.array([1.0], dtype=kernel.dtype)
         details = kernel.info['mono_details']
-        return kernel(details, pars, weights, cutoff)
+        return kernel(details,  weights, pars, cutoff)
     else:
         pairs = [get_weights(p, values) for p in kernel.info['parameters']]
@@ -232 +233 @@
         details = generate.poly_details(kernel.info, weights, pars)
         weights, pars = [np.hstack(v) for v in (weights, pars)]
-        return kernel(details, pars, weights, cutoff)
+        return kernel(details, weights, pars, cutoff)
 
 def call_ER_VR(model_info, vol_pars):

sasmodels/kernel_iq.c

@@ -60 +60 @@
   if (problem->pd_length[0] == 1) {
     // Shouldn't need to copy!!
-    printf("copying\n");
+
     for (int k=0; k < NPARS; k++) {
       pvec[k] = pars[k+2];  // skip scale and background

sasmodels/kerneldll.py

@@ -253 +253 @@
         self.info = model_info
         self.q_input = q_input
+        self.dtype = q_input.dtype
         self.kernel = kernel
         self.res = np.empty(q_input.nq+3, q_input.dtype)
@@ -261 +262 @@
         self.p_res = self.res.ctypes.data
 
-    def __call__(self, details, values, weights, cutoff):
+    def __call__(self, details, weights, values, cutoff):
         real = (np.float32 if self.q_input.dtype == generate.F32
                 else np.float64 if self.q_input.dtype == generate.F64
                 else np.float128)
+        if details.dtype != np.int32 or weights.dtype != real or values.dtype != real:
+            raise TypeError("numeric type does not match the kernel type")
+        #details = np.asarray(details, dtype='int32')
+        #weights = np.asarray(weights, dtype=real)
+        #values = np.asarray(values, dtype=real)
         args = [
             self.q_input.nq, # nq
@@ -277 +283 @@
             ]
         self.kernel(*args)
-
         return self.res[:-3]