Changeset 1e13e35 in sasmodels

Timestamp:

Dec 5, 2016 12:39:59 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c8902ac

Parents:

d6f60c3 (diff), ccd5f01 (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.

git-author:

Jeff Krzywon <krzywon@…> (12/05/16 12:39:59)

git-committer:

GitHub <noreply@…> (12/05/16 12:39:59)

Message:

Merge pull request #13 from SasView?/ticket-816

Ticket 816

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• details.py (modified) (1 diff)

sasmodels/compare.py

@@ -1063 +1063 @@
     # Evaluate preset parameter expressions
     context = MATH.copy()
+    context['np'] = np
     context.update(pars)
     context.update((k,v) for k,v in presets.items() if isinstance(v, float))

sasmodels/details.py

@@ -230 +230 @@
     npars = kernel.info.parameters.npars
     nvalues = kernel.info.parameters.nvalues
-    scalars = [v[0][0] for v in pairs]
+    scalars = [(v[0] if len(v) else np.NaN) for v, w in pairs]
     values, weights = zip(*pairs[2:npars+2]) if npars else ((),())
     length = np.array([len(w) for w in weights])