Changeset 21b116f in sasmodels for sasmodels/bumps_model.py

Timestamp:

Apr 6, 2016 9:13:59 AM (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:

3fb3449

Parents:

d2bb604

Message:

fix the remaining references to the parameter table as list

File:

• sasmodels/bumps_model.py (modified) (2 diffs)

sasmodels/bumps_model.py

@@ -83 +83 @@
     pars = {}     # floating point parameters
     pd_types = {} # distribution names
-    for p in model_info['parameters']:
+    for p in model_info['parameters'].call_parameters:
         value = kwargs.pop(p.name, p.default)
         pars[p.name] = Parameter.default(value, name=p.name, limits=p.limits)
@@ -95 +95 @@
                 value = kwargs.pop(name, default)
                 pars[name] = Parameter.default(value, name=name, limits=limits)
-            pd_types[p.name+'_pd_type'] = kwargs.pop(name, 'gaussian')
+            name = p.name + '_pd_type'
+            pd_types[name] = kwargs.pop(name, 'gaussian')
 
     if kwargs:  # args not corresponding to parameters