Changeset 256dfe1 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Jul 18, 2016 12:42:29 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:

c5ac2b2

Parents:

46ed760

Message:

allow comparison of multiplicity models with sasview 3.x

File:

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

sasmodels/modelinfo.py

@@ -186 +186 @@
         vectors = dict((name,value) for name,value in pars.items()
                        if name in lookup and lookup[name].length > 1)
+        #print("lookup", lookup)
+        #print("scalars", scalars)
+        #print("vectors", vectors)
         if vectors:
             for name, value in vectors.items():
@@ -194 +197 @@
                         key = name+str(k)
                         if key not in scalars:
-                            scalars[key] = vectors
+                            scalars[key] = value
                 else:
                     # supoprt for the form
                     #    dict(thickness=[20,10,3])
                     for (k,v) in enumerate(value):
-                        scalars[name+str(k)] = v
+                        scalars[name+str(k+1)] = v
         result.update(scalars)
+        #print("expanded", result)
 
     return result
@@ -402 +406 @@
     parameters don't use vector notation, and instead use p1, p2, ...
 
-    * *control_parameters* is the
-
     """
     # scale and background are implicit parameters
@@ -455 +457 @@
                          if p.polydisperse and p.type != 'magnetic')
 
-
     def _set_vector_lengths(self):
-        # type: () -> None
+        # type: () -> List[str]
         """
         Walk the list of kernel parameters, setting the length field of the
@@ -466 +467 @@
         initially created.
 
+        Returns the list of control parameter names.
+
         Note: This modifies the underlying parameter object.
         """
         # Sort out the length of the vector parameters such as thickness[n]
+
         for p in self.kernel_parameters:
             if p.length_control:
@@ -478 +482 @@
                                      % (p.length_control, p.name))
                 ref.is_control = True
+                ref.polydisperse = False
                 low, high = ref.limits
                 if int(low) != low or int(high) != high or low < 0 or high > 20:
@@ -689 +694 @@
     info.profile = getattr(kernel_module, 'profile', None) # type: ignore
     info.sesans = getattr(kernel_module, 'sesans', None) # type: ignore
-    info.control = getattr(kernel_module, 'control', None)
+
+    # multiplicity info
+    control_pars = [p.id for p in parameters.kernel_parameters if p.is_control]
+    default_control = control_pars[0] if control_pars else None
+    info.control = getattr(kernel_module, 'control', default_control)
     info.hidden = getattr(kernel_module, 'hidden', None) # type: ignore