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

Timestamp:

Mar 19, 2016 5:37:29 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:

aa24114

Parents:

81d3a0c

Message:

tidy docs and renam solvent_sld

File:

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

sasmodels/models/capped_cylinder.py

@@ -3 +3 @@
 Like :ref:`barbell`, this is a sphereocylinder with end caps that have a
 radius larger than that of the cylinder, but with the center of the end cap
-radius lying within the cylinder. This model simply becomes the a convex
+radius lying within the cylinder. This model simply becomes a convex
 lens when the length of the cylinder $L=0$. See the diagram for the details
 of the geometry and restrictions on parameter values.
@@ -95 +95 @@
     end cap radius lies within the cylinder.
     Note: As the length of cylinder -->0,
-    it becomes a ConvexLens.
+    it becomes a Convex Lens.
     It must be that radius <(=) cap_radius.
     [Parameters];
@@ -104 +104 @@
     cap_radius: radius of the semi-spherical cap,
     sld: SLD of the capped cylinder,
-    solvent_sld: SLD of the solvent.
+    sld_solvent: SLD of the solvent.
 """
 category = "shape:cylinder"
@@ -110 +110 @@
 #             ["name", "units", default, [lower, upper], "type", "description"],
 parameters = [["sld",         "1e-6/Ang^2", 4, [-inf, inf], "",       "Cylinder scattering length density"],
-              ["solvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "",       "Solvent scattering length density"],
+              ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "",       "Solvent scattering length density"],
               ["radius",      "Ang",       20, [0, inf],    "volume", "Cylinder radius"],
 
@@ -132 +132 @@
 
 demo = dict(scale=1, background=0,
-            sld=6, solvent_sld=1,
+            sld=6, sld_solvent=1,
             radius=260, cap_radius=290, length=290,
             theta=30, phi=15,
@@ -142 +142 @@
 oldname = 'CappedCylinderModel'
 oldpars = dict(sld='sld_capcyl',
-               solvent_sld='sld_solv',
+               sld_solvent='sld_solv',
                length='len_cyl',
                radius='rad_cyl',