Changeset a807206 in sasmodels for sasmodels/models/hollow_cylinder.py

Timestamp:

Sep 30, 2016 10:42:06 PM (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:

caddb14, 5031ca3

Parents:

2222134

Message:

updating more parameter names addressing #649

File:

• sasmodels/models/hollow_cylinder.py (modified) (6 diffs)

sasmodels/models/hollow_cylinder.py

@@ -39 +39 @@
 
 In the parameters, the contrast represents SLD :sub:`shell` - SLD :sub:`solvent`
-and the *radius* is $R_\text{shell}$ while *core_radius* is $R_\text{core}$.
+and the *radius* is $R_\text{shell}$ while *radius_core* is $R_\text{core}$.
 
 To provide easy access to the orientation of the core-shell cylinder, we define
@@ -58 +58 @@
 description = """
 P(q) = scale*<f*f>/Vol + background, where f is the scattering amplitude.
-core_radius = the radius of core
+radius_core = the radius of core
 radius = the radius of shell
 length = the total length of the cylinder
@@ -70 +70 @@
 parameters = [
     ["radius",      "Ang",     30.0, [0, inf],    "volume",      "Cylinder radius"],
-    ["core_radius", "Ang",     20.0, [0, inf],    "volume",      "Hollow core radius"],
+    ["radius_core", "Ang",     20.0, [0, inf],    "volume",      "Hollow core radius"],
     ["length",      "Ang",    400.0, [0, inf],    "volume",      "Cylinder length"],
     ["sld",         "1/Ang^2",  6.3, [-inf, inf], "sld",         "Cylinder sld"],
@@ -82 +82 @@
 
 # pylint: disable=W0613
-def ER(radius, core_radius, length):
+def ER(radius, radius_core, length):
     """
     :param radius:      Cylinder radius
-    :param core_radius: Hollow core radius, UNUSED
+    :param radius_core: Hollow core radius, UNUSED
     :param length:      Cylinder length
     :return:            Effective radius
@@ -99 +99 @@
     return diam
 
-def VR(radius, core_radius, length):
+def VR(radius, radius_core, length):
     """
     :param radius:      Cylinder radius
-    :param core_radius: Hollow core radius
+    :param radius_core: Hollow core radius
     :param length:      Cylinder length
     :return:            Volf ratio for P(q)*S(q)
     """
-    vol_core = pi*core_radius*core_radius*length
+    vol_core = pi*radius_core*radius_core*length
     vol_total = pi*radius*radius*length
     vol_shell = vol_total - vol_core
@@ -113 +113 @@
 # parameters for demo
 demo = dict(scale=1.0, background=0.0, length=400.0, radius=30.0,
-            core_radius=20.0, sld=6.3, sld_solvent=1, theta=90, phi=0,
+            radius_core=20.0, sld=6.3, sld_solvent=1, theta=90, phi=0,
             radius_pd=.2, radius_pd_n=9,
             length_pd=.2, length_pd_n=10,
-            core_radius_pd=.2, core_radius_pd_n=9,
+            radius_core_pd=.2, radius_core_pd_n=9,
             theta_pd=10, theta_pd_n=5,
            )