Changeset d2bb604 in sasmodels for sasmodels/core.py

Timestamp:

Apr 5, 2016 2:34:30 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:

21b116f

Parents:

1e2a1ba

Message:

fix models so all dll tests pass

File:

• sasmodels/core.py (modified) (4 diffs)

sasmodels/core.py

@@ -178 +178 @@
     from the *pars* dictionary for parameter value and parameter dispersion.
     """
-    value = values.get(parameter.name, parameter.default)
+    value = float(values.get(parameter.name, parameter.default))
     relative = parameter.relative_pd
     limits = parameter.limits
@@ -200 +200 @@
     """
     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)])
@@ -279 +280 @@
     else:
         vol_pars = [get_weights(parameter, values)
-                    for parameter in model_info['parameters']
+                    for parameter in model_info['parameters'].call_parameters
                     if parameter.type == 'volume']
         value, weight = dispersion_mesh(vol_pars)
         individual_radii = ER(*value)
-        #print(values[0].shape, weights.shape, fv.shape)
         return np.sum(weight*individual_radii) / np.sum(weight)
 
@@ -297 +297 @@
     else:
         vol_pars = [get_weights(parameter, values)
-                    for parameter in model_info['parameters']
+                    for parameter in model_info['parameters'].call_parameters
                     if parameter.type == 'volume']
         value, weight = dispersion_mesh(vol_pars)