Changeset 4bfd277 in sasmodels for sasmodels/details.py

Timestamp:

Apr 8, 2016 12:11:16 PM (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:

2afc26d

Parents:

d2fc9a4

Message:

support ER/VR calls with vector parameters

File:

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

sasmodels/details.py

@@ -144 +144 @@
             return [np.asarray(v) for v in args]
 
-def dispersion_mesh(pars):
+def dispersion_mesh(model_info, pars):
     """
     Create a mesh grid of dispersion parameters and weights.
@@ -154 +154 @@
     value, weight = zip(*pars)
     weight = [w if w else [1.] for w in weight]
-    value = [v.flatten() for v in meshgrid(*value)]
     weight = np.vstack([v.flatten() for v in meshgrid(*weight)])
     weight = np.prod(weight, axis=0)
+    value = [v.flatten() for v in meshgrid(*value)]
+    lengths = [par.length for par in model_info.parameters.kernel_parameters
+               if par.type == 'volume']
+    if any(n > 1 for n in lengths):
+        pars = []
+        offset = 0
+        for n in lengths:
+            pars.append(np.vstack(value[offset:offset+n]) if n > 1 else value[offset])
+            offset += n
+        value = pars
     return value, weight