Changeset a738209 in sasmodels for sasmodels/direct_model.py

Timestamp:

Jul 15, 2016 9:33:33 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:

def2c1b

Parents:

98ba1fc

Message:

simplify kernels by remove coordination parameter logic

File:

• sasmodels/direct_model.py (modified) (2 diffs)

sasmodels/direct_model.py

@@ -66 +66 @@
 
     vw_pairs = [(get_weights(p, pars) if active(p.name)
-                 else ([pars.get(p.name, p.default)], []))
+                 else ([pars.get(p.name, p.default)], [1.0]))
                 for p in parameters.call_parameters]
 
-    call_details, weights, values = kernel.build_details(calculator, vw_pairs)
-    return calculator(call_details, weights, values, cutoff)
+    call_details, values = kernel.build_details(calculator, vw_pairs)
+    return calculator(call_details, values, cutoff)
 
 def get_weights(parameter, values):
@@ -89 +89 @@
     nsigma = values.get(parameter.name+'_pd_nsigma', 3.0)
     if npts == 0 or width == 0:
-        return [value], []
+        return [value], [1.0]
     value, weight = weights.get_weights(
         disperser, npts, width, nsigma, value, limits, relative)