Changeset fb5914f in sasmodels for sasmodels/modelinfo.py

Timestamp:

Mar 30, 2016 1:34:16 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:

7a1143b, 3a45c2c

Parents:

ce896fd

Message:

bind sasview to new parameter table definition

File:

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

sasmodels/modelinfo.py

@@ -432 +432 @@
                          if p.polydisperse and p.type != 'magnetic')
 
-    def user_parameters(self, pars, is2d):
+    def user_parameters(self, pars={}, is2d=True):
         """
         Return the list of parameters for the given data type.
@@ -493 +493 @@
                 if table:
                     # look up length from incoming parameters
-                    table_length = int(pars[p.length_control])
+                    table_length = int(pars.get(p.length_control, p.length))
                     del dependent[p.length_control] # first entry seen
                     for k in range(1, table_length+1):