Changeset fb5914f in sasmodels for sasmodels/core.py

Timestamp:

Mar 30, 2016 1:34:16 AM (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:

7a1143b, 3a45c2c

Parents:

ce896fd

Message:

bind sasview to new parameter table definition

File:

• sasmodels/core.py (modified) (1 diff)

sasmodels/core.py

@@ -241 +241 @@
                  else ([pars.get(p.name, p.default)], []))
                 for p in parameters.call_parameters]
-    values, weights = zip(*vw_pairs)
-
+
+    details, weights, values = build_details(kernel, vw_pairs)
+    return kernel(details, weights, values, cutoff)
+
+def build_details(kernel, pairs):
+    values, weights = zip(*pairs)
     if max([len(w) for w in weights]) > 1:
         details = generate.poly_details(kernel.info, weights)
     else:
         details = kernel.info['mono_details']
-
     weights, values = [np.hstack(v) for v in (weights, values)]
-
     weights = weights.astype(dtype=kernel.dtype)
     values = values.astype(dtype=kernel.dtype)
-    return kernel(details, weights, values, cutoff)
+    return details, weights, values
+
 
 def call_ER_VR(model_info, vol_pars):