Changes in / [aa2edb2:4373d62] in sasmodels

File:

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

sasmodels/compare.py

@@ -301 +301 @@
             pars['Phi'+c] /= total
 
-def parlist(pars):
+def parlist(model_info, pars, is2d):
     """
     Format the parameter list for printing.
     """
-    active = None
-    fields = {}
+    if is2d:
+        exclude = lambda n: False
+    else:
+        partype = model_info['partype']
+        par1d = set(partype['fixed-1d']+partype['pd-1d'])
+        exclude = lambda n: n not in par1d
     lines = []
-    for k, v in sorted(pars.items()):
-        parts = k.split('_pd')
-        #print(k, active, parts)
-        if len(parts) == 1:
-            if active: lines.append(_format_par(active, **fields))
-            active = k
-            fields = {'value': v}
-        else:
-            assert parts[0] == active
-            if parts[1]:
-                fields[parts[1][1:]] = v
-            else:
-                fields['pd'] = v
-    if active: lines.append(_format_par(active, **fields))
+    for p in model_info['parameters']:
+        if exclude(p.name): continue
+        fields = dict(
+            value=pars.get(p.name, p.default),
+            pd=pars.get(p.name+"_pd", 0.),
+            n=int(pars.get(p.name+"_pd_n", 0)),
+            nsigma=pars.get(p.name+"_pd_nsgima", 3.),
+            type=pars.get(p.name+"_pd_type", 'gaussian'))
+        lines.append(_format_par(p.name, **fields))
     return "\n".join(lines)
 
@@ -837 +836 @@
     constrain_new_to_old(model_info, pars)
     if opts['show_pars']:
-        print(str(parlist(pars)))
+        print(str(parlist(model_info, pars, opts['is2d'])))
 
     # Create the computational engines