Changeset b99734a in sasmodels

Timestamp:

Oct 1, 2016 11:11:33 AM (8 years ago)

Author:

butler

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:

7c57861

Parents:

e0de72f

Message:

fix name of c file called by new core_shell_ellipsoid and edited the
documentation to remove comparison to old core_shell_ellipsoid.

File:

• sasmodels/models/core_shell_ellipsoid.py (modified) (4 diffs)

sasmodels/models/core_shell_ellipsoid.py

@@ -1 +1 @@
 r"""
-An alternative version of $P(q)$ for the core_shell_ellipsoid
-having as parameters the core axial ratio X and a shell thickness,
-which are more often what we would like to determine.
-
-This model is also better behaved when polydispersity is applied than the four
-independent radii in core_shell_ellipsoid model.
-
 Definition
 ----------
+
+Parameters for this model are the core axial ratio X and a shell thickness,
+which are more often what we would like to determine and makes the model
+better behaved, particularly when polydispersity is applied than the four
+independent radii used in the original parameterization of this model.
+
 
 .. figure:: img/core_shell_ellipsoid_geometry.png
@@ -14 +13 @@
 The geometric parameters of this model are
 
-*radius_equat_core =* equatorial core radius *= R_minor_core*
+*radius_equat_core =* equatorial core radius *= Rminor_core*
 
 *X_core = polar_core / radius_equat_core = Rmajor_core / Rminor_core*
@@ -58 +57 @@
 from numpy import inf, sin, cos, pi
 
-name = "core_shell_ellipsoid_xt"
+name = "core_shell_ellipsoid"
 title = "Form factor for an spheroid ellipsoid particle with a core shell structure."
 description = """
-        [core_shell_ellipsoid_xt] Calculates the form factor for an spheroid
+        [core_shell_ellipsoid] Calculates the form factor for an spheroid
         ellipsoid particle with a core_shell structure.
         The form factor is averaged over all possible
@@ -101 +100 @@
 
 source = ["lib/sph_j1c.c", "lib/gfn.c", "lib/gauss76.c",
-          "core_shell_ellipsoid_xt.c"]
+          "core_shell_ellipsoid.c"]
 
 def ER(radius_equat_core, x_core, thick_shell, x_polar_shell):