Changeset a4a7308 in sasmodels for sasmodels/compare.py

Timestamp:

Mar 1, 2016 5:45:53 PM (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:

50e1e40

Parents:

ce0b154

Message:

nicer formatting for parameters

File:

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

sasmodels/compare.py

@@ -305 +305 @@
     Format the parameter list for printing.
     """
-    return "\n".join("%s: %s"%(p, v) for p, v in sorted(pars.items()))
+    active = None
+    fields = {}
+    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))
+    return "\n".join(lines)
+
+    #return "\n".join("%s: %s"%(p, v) for p, v in sorted(pars.items()))
+
+def _format_par(name, value=0., pd=0., n=0, nsigma=3., type='gaussian'):
+    line = "%s: %g"%(name, value)
+    if pd != 0.  and n != 0:
+        line += " +/- %g  (%d points in [-%g,%g] sigma %s)"\
+                % (pd, n, nsigma, nsigma, type)
+    return line
 
 def suppress_pd(pars):
@@ -770 +796 @@
     constrain_new_to_old(model_definition, pars)
     if opts['show_pars']:
-        print("pars " + str(parlist(pars)))
+        print(str(parlist(pars)))
 
     # Create the computational engines