Changeset 439ffcd in sasmodels

Timestamp:

Oct 30, 2017 9:29:12 AM (6 years ago)

Author:

gonzalezm

Branches:

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

Children:

ee95012

Parents:

1f35235

Message:

Fixes #1006

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):
+def profile(sld_core, radius, sld_solvent, n, sld, thickness, **kwargs):
     """
     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):
+            sld_in, sld_out, thickness, A, **kwargs):
     """
     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):
+            interface, shape, nu, n_steps, **kwargs):
     """
     Returns shape profile with x=radius, y=SLD.

sasmodels/product.py

@@ -101 +101 @@
     model_info.composition = ('product', [p_info, s_info])
     model_info.control = p_info.control
+    model_info.hidden = p_info.hidden
+    model_info.profile = p_info.profile
+    model_info.profile_axes = p_info.profile_axes
+    
     # TODO: delegate random to p_info, s_info
     #model_info.random = lambda: {}