Changeset 765eb0e in sasmodels for sasmodels/mixture.py

Timestamp:

Sep 11, 2017 5:42:31 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

2ad5d30

Parents:

ce8c388

Message:

allow random generation of parameters for product and mixture models

File:

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

sasmodels/mixture.py

@@ -40 +40 @@
     # Build new parameter list
     combined_pars = []
-    demo = {}
     for k, part in enumerate(parts):
         # Parameter prefix per model, A_, B_, ...
@@ -56 +55 @@
                 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)
     parameters.max_pd = sum(part.parameters.max_pd for part in parts)
+
+    def random():
+        combined_pars = {}
+        for k, part in enumerate(parts):
+            prefix = chr(ord('A')+k) + '_'
+            pars = part.random()
+            combined_pars.update((prefix+k, v) for k, v in pars.items())
+        return combined_pars
 
     model_info = ModelInfo()
@@ -71 +75 @@
     model_info.category = "custom"
     model_info.parameters = parameters
+    model_info.random = random
     #model_info.single = any(part['single'] for part in parts)
     model_info.structure_factor = False
@@ -79 +84 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('mixture', parts)
-    model_info.demo = demo
     return model_info
 
@@ -88 +92 @@
         self.info = model_info
         self.parts = parts
+        self.dtype = parts[0].dtype
 
     def make_kernel(self, q_vectors):