Changeset 27fade8 in sasmodels

Timestamp:

Mar 30, 2016 2:13:13 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

b0696e1

Parents:

b812972

Message:

fix calls to ER for core shell ellipsoid and ellipsoid xt functions

Location:

sasmodels/models

Files:

• core_shell_ellipsoid.py (modified) (2 diffs)
• core_shell_ellipsoid_xt.py (modified) (1 diff)

sasmodels/models/core_shell_ellipsoid.py

@@ -117 +117 @@
 source = ["lib/sph_j1c.c", "lib/gfn.c", "lib/gauss76.c", "core_shell_ellipsoid.c"]
 
-def ER(equat_shell, polar_shell):
+def ER(equat_core, polar_core, equat_shell, polar_shell):
     """
         Returns the effective radius used in the S*P calculation
@@ -123 +123 @@
     import numpy as np
     from .ellipsoid import ER as ellipsoid_ER
-    return ellipsoid_ER(rpolar, equat_shell)
+    return ellipsoid_ER(polar_shell, equat_shell)
 
 

sasmodels/models/core_shell_ellipsoid_xt.py

@@ -107 +107 @@
         Returns the effective radius used in the S*P calculation
     """
-    import numpy as np
     from .ellipsoid import ER as ellipsoid_ER
-    return ellipsoid_ER(equat_core*x_core + t_shell*x_polar_shell, equat_shell + t_shell)
+    polar_outer = equat_core*x_core + t_shell*x_polar_shell
+    equat_outer = equat_core + t_shell
+    return ellipsoid_ER(polar_outer, equat_outer)