Changes in / [d6f60c3:1e13e35] in sasmodels

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])