Changeset ee95012 in sasmodels

Timestamp:

Oct 31, 2017 6:45:31 AM (7 years ago)

Author:

Gonzalez, Miguel <gonzalez@…>

Branches:

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

Children:

edb0f85

Parents:

439ffcd

Message:

Fixes #1006 (cleaner)

Location:

sasmodels

Files:

• models/core_multi_shell.py (modified) (1 diff)
• models/onion.py (modified) (1 diff)
• models/spherical_sld.py (modified) (1 diff)
• product.py (modified) (1 diff)

sasmodels/models/core_multi_shell.py

@@ -118 +118 @@
     return pars
 
-def profile(sld_core, radius, sld_solvent, n, sld, thickness, **kwargs):
+def profile(sld_core, radius, sld_solvent, n, sld, thickness):
     """
     Returns the SLD profile *r* (Ang), and *rho* (1e-6/Ang^2).

sasmodels/models/onion.py

@@ -318 +318 @@
 profile_axes = ['Radius (A)', 'SLD (1e-6/A^2)']
 def profile(sld_core, radius_core, sld_solvent, n_shells,
-            sld_in, sld_out, thickness, A, **kwargs):
+            sld_in, sld_out, thickness, A):
     """
     Returns shape profile with x=radius, y=SLD.

sasmodels/models/spherical_sld.py

@@ -222 +222 @@
 
 def profile(n_shells, sld_solvent, sld, thickness,
-            interface, shape, nu, n_steps, **kwargs):
+            interface, shape, nu, n_steps):
     """
     Returns shape profile with x=radius, y=SLD.

sasmodels/product.py

@@ -102 +102 @@
     model_info.control = p_info.control
     model_info.hidden = p_info.hidden
-    model_info.profile = p_info.profile
+    if getattr(p_info, 'profile', None) is not None:
+        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)
+    else:
+        profile = None
+    model_info.profile = profile
     model_info.profile_axes = p_info.profile_axes