Changeset 2222134 in sasmodels for sasmodels/models/capped_cylinder.py

Timestamp:

Sep 30, 2016 11:07:16 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:

a807206

Parents:

6e5b2a7

Message:

Updating parameter names regarding #649

File:

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

sasmodels/models/capped_cylinder.py

@@ -96 +96 @@
     Note: As the length of cylinder -->0,
     it becomes a Convex Lens.
-    It must be that radius <(=) cap_radius.
+    It must be that radius <(=) radius_cap.
     [Parameters];
     scale: volume fraction of spheres,
@@ -102 +102 @@
     radius: radius of the cylinder,
     length: length of the cylinder,
-    cap_radius: radius of the semi-spherical cap,
+    radius_cap: radius of the semi-spherical cap,
     sld: SLD of the capped cylinder,
     sld_solvent: SLD of the solvent.
@@ -122 +122 @@
               # in the capped cylinder, and zero for no bar in the barbell model.  In
               # both models, one would be a pill.
-              ["cap_radius", "Ang",     20, [0, inf],    "volume", "Cap radius"],
+              ["radius_cap", "Ang",     20, [0, inf],    "volume", "Cap radius"],
               ["length",     "Ang",    400, [0, inf],    "volume", "Cylinder length"],
               ["theta",      "degrees", 60, [-inf, inf], "orientation", "In plane angle"],
@@ -133 +133 @@
 demo = dict(scale=1, background=0,
             sld=6, sld_solvent=1,
-            radius=260, cap_radius=290, length=290,
+            radius=260, radius_cap=290, length=290,
             theta=30, phi=15,
             radius_pd=.2, radius_pd_n=1,
-            cap_radius_pd=.2, cap_radius_pd_n=1,
+            radius_cap_pd=.2, radius_cap_pd_n=1,
             length_pd=.2, length_pd_n=10,
             theta_pd=15, theta_pd_n=45,