Changeset 65bf704 in sasmodels

Timestamp:

Mar 20, 2016 12:43:12 PM (8 years ago)

Author:

richardh

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:

db74c47

Parents:

4416868

Message:

added ER to core_shell_ellipsoid, core_shell_ellipsoid_xt and fixed bug in flexible_cylinder_elliptical doc

Location:

sasmodels/models

Files:

• core_shell_ellipsoid.py (modified) (1 diff)
• core_shell_ellipsoid_xt.py (modified) (1 diff)
• flexible_cylinder_elliptical.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):
+    """
+        Returns the effective radius used in the S*P calculation
+    """
+    import numpy as np
+    from .ellipsoid import ER as ellipsoid_ER
+    return ellipsoid_ER(rpolar, equat_shell)
+
+
 demo = dict(scale=1, background=0.001,
             equat_core=200.0,

sasmodels/models/core_shell_ellipsoid_xt.py

@@ -103 +103 @@
           "core_shell_ellipsoid_xt.c"]
 
+def ER(equat_core, x_core, t_shell, x_polar_shell):
+    """
+        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)
+
+
 demo = dict(scale=0.05, background=0.001,
             equat_core=20.0,

sasmodels/models/flexible_cylinder_elliptical.py

@@ -85 +85 @@
 from numpy import inf
 
-name = "flexible_cylinder_ex"
+name = "flexible_cylinder_elliptical"
 title = "Flexible cylinder wth an elliptical cross section and a uniform " \
         "scattering length density."