Changeset 16bc3fc in sasmodels

Timestamp:

Feb 19, 2015 9:00:19 AM (9 years ago)

Author:

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:

6edb74a

Parents:

8632a35

Message:

fix direct model evaluation to use default value if parameter value is not given

File:

• sasmodels/direct_model.py (modified) (3 diffs)

sasmodels/direct_model.py

@@ -46 +46 @@
     limits = kernel.info['limits']
     disperser = pars.get(name+'_pd_type', 'gaussian')
-    value = pars.get(name)
+    value = pars.get(name, kernel.info['defaults'][name])
     npts = pars.get(name+'_pd_n', 0)
     width = pars.get(name+'_pd', 0.0)
@@ -67 +67 @@
         q_vectors = [np.ascontiguousarray(q,dtype=dtype) for q in q_vectors]
         self.kernel = make_kernel(self.model, q_vectors)
-    def __call__(self, pars):
+    def __call__(self, **pars):
         return call_kernel(self.kernel, pars)
 
@@ -90 +90 @@
                 for pair in sys.argv[3:]
                 for k,v in [pair.split('=')])
-    Iq = model(pars)
+    Iq = model(**pars)
     print Iq[0]