Changeset d2bb604 in sasmodels for sasmodels/resolution.py

Timestamp:

Apr 5, 2016 12: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/resolution.py (modified) (2 diffs)

sasmodels/resolution.py

@@ -502 +502 @@
     from scipy.integrate import romberg
 
-    par_set = set([p.name for p in form.info['parameters']])
+    par_set = set([p.name for p in form.info['parameters'].call_parameters])
     if any(k not in par_set for k in pars.keys()):
         extra = set(pars.keys()) - par_set
-        raise ValueError("bad parameters: [%s] not in [%s]"%
-                         (", ".join(sorted(extra)), ", ".join(sorted(keys))))
+        raise ValueError("bad parameters: [%s] not in [%s]"
+                         % (", ".join(sorted(extra)),
+                            ", ".join(sorted(pars.keys()))))
 
     if np.isscalar(width):
@@ -556 +557 @@
     from scipy.integrate import romberg
 
-    par_set = set([p.name for p in form.info['parameters']])
+    par_set = set([p.name for p in form.info['parameters'].call_parameters])
     if any(k not in par_set for k in pars.keys()):
         extra = set(pars.keys()) - par_set
-        raise ValueError("bad parameters: [%s] not in [%s]"%
-                         (", ".join(sorted(extra)),
-                          ", ".join(sorted(pars.keys()))))
+        raise ValueError("bad parameters: [%s] not in [%s]"
+                         % (", ".join(sorted(extra)),
+                            ", ".join(sorted(pars.keys()))))
 
     _fn = lambda q, q0, dq: eval_form(q, form, pars)*gaussian(q, q0, dq)