Changeset d19962c in sasmodels for sasmodels/compare.py

Timestamp:

Mar 27, 2016 6:57:03 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:

5c028e3

Parents:

c499331

Message:

working vector parameter example using dll engine

File:

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

sasmodels/compare.py

@@ -308 +308 @@
     lines = []
     parameters = model_info['parameters']
-    for p in parameters.type['2d' if is2d else '1d']:
-        if p.length > 1:
-            for k in range(p.length):
-                ext = "[%d]"%k
-                fields = dict(
-                    value=pars.get(p.id+ext, p.default),
-                    pd=pars.get(p.id+"_pd"+ext, 0.),
-                    n=int(pars.get(p.id+"_pd_n"+ext, 0)),
-                    nsigma=pars.get(p.id+"_pd_nsgima"+ext, 3.),
-                    type=pars.get(p.id+"_pd_type"+ext, 'gaussian'))
-                lines.append(_format_par(p.id+ext, **fields))
-        else:
-            fields = dict(
-                value=pars.get(p.id, p.default),
-                pd=pars.get(p.id+"_pd", 0.),
-                n=int(pars.get(p.id+"_pd_n", 0)),
-                nsigma=pars.get(p.id+"_pd_nsgima", 3.),
-                type=pars.get(p.id+"_pd_type", 'gaussian'))
-            lines.append(_format_par(p.name, **fields))
+    for p in parameters.user_parameters(pars, is2d):
+        fields = dict(
+            value=pars.get(p.id, p.default),
+            pd=pars.get(p.id+"_pd", 0.),
+            n=int(pars.get(p.id+"_pd_n", 0)),
+            nsigma=pars.get(p.id+"_pd_nsgima", 3.),
+            type=pars.get(p.id+"_pd_type", 'gaussian'))
+        lines.append(_format_par(p.name, **fields))
     return "\n".join(lines)
 
@@ -668 +657 @@
     # Get the default values for the parameters
     pars = {}
-    for p in model_info['parameters']:
+    for p in model_info['parameters'].call_parameters:
         parts = [('', p.default)]
         if p.polydisperse:
@@ -677 +666 @@
         for ext, val in parts:
             if p.length > 1:
-                dict(("%s%s[%d]"%(p.id,ext,k), val) for k in range(p.length))
+                dict(("%s%d%s"%(p.id,k,ext), val) for k in range(p.length))
             else:
                 pars[p.id+ext] = val
@@ -709 +698 @@
     name = args[0]
     try:
-        if name.endswith('.py'):
-            model_info = core.load_model_info_from_path(name)
-        else:
-            model_info = core.load_model_info(name)
+        model_info = core.load_model_info(name)
     except ImportError, exc:
         print(str(exc))