Changeset ce896fd in sasmodels for sasmodels/modelinfo.py

Timestamp:

Mar 28, 2016 7:27:22 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:

fb5914f, d1c4760

Parents:

5c028e3

Message:

improved handling of vector parameters; remove compile errors from onion.c

File:

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

sasmodels/modelinfo.py

@@ -45 +45 @@
     if isinstance(limits, list) and all(isstr(k) for k in limits):
         choices = limits
-        limits = [1, len(choices)]
+        limits = [0, len(choices)-1]
     else:
-        choices = None
+        choices = []
     # TODO: maybe allow limits of None for (-inf, inf)
     try:
@@ -115 +115 @@
     return parameter
 
+
+def set_demo(model_info, demo):
+    """
+    Assign demo parameters to model_info['demo']
+
+    If demo is not defined, then use defaults.
+
+    If demo is defined, override defaults with value from demo.
+
+    If demo references vector fields, such as thickness[n], then support
+    different ways of assigning the demo values, including assigning a
+    specific value (e.g., thickness3=50.0), assigning a new value to all
+    (e.g., thickness=50.0) or assigning values using list notation.
+    """
+    partable = model_info['parameters']
+    if demo is None:
+        result = partable.defaults
+    else:
+        pars = dict((p.id, p) for p in partable.kernel_parameters)
+        result = partable.defaults.copy()
+        vectors = dict((name,value) for name,value in demo.items()
+                       if name in pars and pars[name].length > 1)
+        if vectors:
+            scalars = dict((name, value) for name, value in demo.items()
+                           if name not in pars or pars[name].length == 1)
+            for name, value in vectors.items():
+                if np.isscalar(value):
+                    # support for the form
+                    #    demo(thickness=0, thickness2=50)
+                    for k in pars[name].length:
+                        key = name+str(k)
+                        if key not in scalars:
+                            scalars[key] = vectors
+                else:
+                    # supoprt for the form
+                    #    demo(thickness=[20,10,3])
+                    for (k,v) in enumerate(value):
+                        scalars[name+str(k)] = v
+            result.update(scalars)
+        else:
+            result.update(demo)
+
+    model_info['demo'] = result
+
 class Parameter(object):
     """
@@ -171 +215 @@
         self.type = type
         self.description = description
-        self.choices = None
 
         # Length and length_control will be filled in once the complete
@@ -182 +225 @@
         self.polydisperse = False
         self.relative_pd = False
+
+        # choices are also set externally.
+        self.choices = []
 
     def as_definition(self):