Changeset fe496dd in sasmodels

Timestamp:

Aug 16, 2016 1:06:00 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:

6b7e2f7

Parents:

725ee36

git-author:

Paul Kienzle <pkienzle@…> (08/16/16 00:20:53)

git-committer:

Paul Kienzle <pkienzle@…> (08/16/16 01:06:00)

Message:

propagate demo values to mixture demo

File:

• sasmodels/mixture.py (modified) (6 diffs)

sasmodels/mixture.py

@@ -28 +28 @@
     # type: (List[ModelInfo]) -> ModelInfo
     """
-    Create info block for product model.
+    Create info block for mixture model.
     """
     flatten = []
@@ -40 +40 @@
     # Build new parameter list
     combined_pars = []
+    demo = {}
     for k, part in enumerate(parts):
         # Parameter prefix per model, A_, B_, ...
@@ -55 +56 @@
                 p.length_control = prefix + p.length_control
             combined_pars.append(p)
+        demo.update((prefix+k, v) for k, v in part.demo.items()
+                    if k != "background")
     #print("pars",combined_pars)
     parameters = ParameterTable(combined_pars)
@@ -76 +79 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('mixture', parts)
-    model_info.demo = {}
+    model_info.demo = demo
     return model_info
 
@@ -115 +118 @@
 
     def __call__(self, call_details, values, cutoff, magnetic):
-        # type: (CallDetails, np.ndarray, np.ndarry, float) -> np.ndarray
+        # type: (CallDetails, np.ndarray, np.ndarry, float, bool) -> np.ndarray
         scale, background = values[0:2]
         total = 0.0
@@ -139 +142 @@
 class MixtureParts(object):
     def __init__(self, model_info, kernels, call_details, values):
+        # type: (ModelInfo, List[Kernel], CallDetails, np.ndarray) -> None
         self.model_info = model_info
         self.parts = model_info.composition[1]