Changeset 765eb0e in sasmodels for sasmodels/product.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/product.py (modified) (4 diffs)

sasmodels/product.py

@@ -68 +68 @@
     translate_name = dict((old.id, new.id) for old, new
                           in zip(s_pars.kernel_parameters[1:], s_list))
-    demo = {}
-    demo.update(p_info.demo.items())
-    demo.update((translate_name[k], v) for k, v in s_info.demo.items()
-                if k not in ("background", "scale") and not k.startswith(ER_ID))
     combined_pars = p_pars.kernel_parameters + s_list
     parameters = ParameterTable(combined_pars)
     parameters.max_pd = p_pars.max_pd + s_pars.max_pd
+    def random():
+        combined_pars = p_info.random()
+        s_names = set(par.id for par in s_pars.kernel_parameters[1:])
+        s = s_info.random()
+        combined_pars.update((translate_name[k], v)
+                    for k, v in s_info.random().items()
+                    if k in s_names)
+        return combined_pars
 
     model_info = ModelInfo()
@@ -85 +89 @@
     model_info.category = "custom"
     model_info.parameters = parameters
+    model_info.random = random
     #model_info.single = p_info.single and s_info.single
     model_info.structure_factor = False
@@ -95 +100 @@
     # TODO: delegate random to p_info, s_info
     #model_info.random = lambda: {}
-    model_info.demo = demo
-
-    ## Show the parameter table with the demo values
+
+    ## Show the parameter table
     #from .compare import get_pars, parlist
     #print("==== %s ====="%model_info.name)
-    #values = get_pars(model_info, use_demo=True)
+    #values = get_pars(model_info)
     #print(parlist(model_info, values, is2d=True))
     return model_info
@@ -126 +130 @@
         self.P = P
         self.S = S
+        self.dtype = P.dtype
 
     def make_kernel(self, q_vectors):