Changeset 21b116f in sasmodels

Timestamp:

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

Location:

sasmodels

Files:

• bumps_model.py (modified) (2 diffs)
• compare.py (modified) (1 diff)
• list_pars.py (modified) (1 diff)
• modelinfo.py (modified) (1 diff)

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

sasmodels/compare.py

@@ -877 +877 @@
         model_info = opts['def']
         pars, pd_types = bumps_model.create_parameters(model_info, **opts['pars'])
+        # Initialize parameter ranges, fixing the 2D parameters for 1D data.
         if not opts['is2d']:
-            for p in model_info['parameters'].type['1d']:
+            for p in model_info['parameters'].user_parameters(is2d=False):
                 for ext in ['', '_pd', '_pd_n', '_pd_nsigma']:
                     k = p.name+ext

sasmodels/list_pars.py

@@ -25 +25 @@
     for name in sorted(MODELS):
         model_info = load_model_info(name)
-        for p in model_info['parameters']:
+        for p in model_info['parameters'].kernel_parameters:
             partable.setdefault(p.name, [])
             partable[p.name].append(name)

sasmodels/modelinfo.py

@@ -378 +378 @@
         self.call_parameters = full_list
 
-    """ # Suppress these for now until we see how they are used
-    def __getitem__(self, k):
-        if isinstance(k, (int, slice)):
-            return self.parameters[k]
-        else:
-            return self._name_table[k]
-
-    def __contains__(self, key):
-        return key in self._name_table
-
-    def __iter__(self):
-        return iter(self.expanded_parameters)
-    """
-
     def _categorize_parameters(self):
         # Set the kernel parameters.  Assumes background and scale are the