Changeset edb0f85 in sasmodels

Timestamp:

Nov 2, 2017 1:47:06 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:

3a45c2c

Parents:

ee95012

Message:

tweak implementation of sld profile for product models

Location:

sasmodels

Files:

• product.py (modified) (1 diff)
• sasview_model.py (modified) (1 diff)

sasmodels/product.py

@@ -103 +103 @@
     model_info.hidden = p_info.hidden
     if getattr(p_info, 'profile', None) is not None:
+        profile_pars = set(p.id for p in p_info.parameters.kernel_parameters)
         def profile(**kwargs):
-            list_params = [p.name.split('[')[0] for p in p_info.parameters.kernel_parameters]
-            form_factor_args = dict((k, v) for k, v in kwargs.items() if k in list_params)            
-            return p_info.profile(**form_factor_args)
+            # extract the profile args
+            kwargs = dict((k, v) for k, v in kwargs.items() if k in profile_pars)
+            return p_info.profile(**kwargs)
     else:
         profile = None
     model_info.profile = profile
     model_info.profile_axes = p_info.profile_axes
-    
+
     # TODO: delegate random to p_info, s_info
     #model_info.random = lambda: {}

sasmodels/sasview_model.py

@@ -205 +205 @@
                                            structure_factor._model_info)
     ConstructedModel = make_model_from_info(model_info)
-    return ConstructedModel(form_factor.multiplicity)    
+    return ConstructedModel(form_factor.multiplicity)