Changeset 39cc3be in sasmodels for sasmodels/core.py

Timestamp:

Mar 21, 2016 7:05:29 AM (8 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

File:

• sasmodels/core.py (modified) (2 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):