Changeset 88aa3ee in sasmodels

Timestamp:

Mar 21, 2016 2:12:43 PM (9 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:

48fbd50, 3a45c2c

Parents:

445d1c0

Message:

again, with functional solution

File:

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

sasmodels/core.py

@@ -222 +222 @@
     """
     if mono:
-        active = set()
+        active = lambda name: False
     elif kernel.dim == '1d':
-        active = set(kernel.info['par_type']['1d'])
+        active = lambda name: name in set(kernel.info['par_type']['1d'])
     elif kernel.dim == '2d':
-        active = set(kernel.info['par_type']['2d'])
-    else:
-        vw_pairs = [get_weights(p, pars) for p in kernel.info['parameters']]
-
-    vw_pairs = [(get_weights(p, pars) if p.name in active else ([p.default], [1]))
+        active = lambda name: name in set(kernel.info['par_type']['2d'])
+    else:
+        active = lambda name: True
+
+    vw_pairs = [(get_weights(p, pars) if active(p.name) else ([p.default], [1]))
                 for p in kernel.info['parameters']]
     values, weights = zip(*vw_pairs)