Changeset 31641b2 in sasmodels for sasmodels/core.py

Timestamp:

Mar 21, 2016 4:20:32 PM (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:

abc03d8

Parents:

afda63c (diff), 88aa3ee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'polydisp' of ​https://github.com/SasView/sasmodels into polydisp

File:

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

sasmodels/core.py

@@ -222 +222 @@
     """
     if mono:
-        values = [pars.get(p.name, p.default) for p in kernel.info['parameters']]
-        weights = [1.0]*len(values)
-    else:
-        vw_pairs = [get_weights(p, pars) for p in kernel.info['parameters']]
-        values, weights = zip(*vw_pairs)
-
-    #TODO: This is what we thought to do if max([len(w) for w in weights]) > 1:
-    print("from")
-    import pprint; pprint.pprint(weights)
-    print("to")
+        active = lambda name: False
+    elif kernel.dim == '1d':
+        active = lambda name: name in set(kernel.info['par_type']['1d'])
+    elif kernel.dim == '2d':
+        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)
+
     if max([len(w) for w in weights]) > 1:
         details = generate.poly_details(kernel.info, weights)