Changeset 65ceb7d in sasmodels for sasmodels/product.py

Timestamp:

Sep 18, 2017 12:53:23 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

3a45c2c

Parents:

2f9f1ec (diff), 058460c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into costrafo411

File:

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

sasmodels/product.py

@@ -45 +45 @@
     # structure factor calculator.  Structure factors should not
     # have any magnetic parameters
+    if not len(s_info.parameters.kernel_parameters) >= 2:
+        raise TypeError("S needs {} and {} as its first parameters".format(ER_ID, VF_ID))
     if not s_info.parameters.kernel_parameters[0].id == ER_ID:
-        raise TypeError("S needs %s as first parameter"%ER_ID)
+        raise TypeError("S needs {} as first parameter".format(ER_ID))
     if not s_info.parameters.kernel_parameters[1].id == VF_ID:
-        raise TypeError("S needs %s as second parameter"%VF_ID)
+        raise TypeError("S needs {} as second parameter".format(VF_ID))
     if not s_info.parameters.magnetism_index == []:
         raise TypeError("S should not have SLD parameters")
@@ -68 +70 @@
     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()
-    model_info.id = '*'.join((p_id, s_id))
-    model_info.name = '*'.join((p_name, s_name))
+    model_info.id = '@'.join((p_id, s_id))
+    model_info.name = '@'.join((p_name, s_name))
     model_info.filename = None
     model_info.title = 'Product of %s and %s'%(p_name, s_name)
@@ -85 +91 @@
     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
@@ -93 +100 @@
     # Remember the component info blocks so we can build the model
     model_info.composition = ('product', [p_info, s_info])
-    model_info.demo = demo
-
-    ## Show the parameter table with the demo values
+    # TODO: delegate random to p_info, s_info
+    #model_info.random = lambda: {}
+
+    ## 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
@@ -124 +132 @@
         self.P = P
         self.S = S
+        self.dtype = P.dtype
 
     def make_kernel(self, q_vectors):