Changeset 485aee2 in sasmodels for sasmodels/models/capped_cylinder.py

Timestamp:

Mar 9, 2015 2:45:01 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

3e428ec

Parents:

5ef0633

Message:

Trying to get us starting on the right foot with code style.

File:

• sasmodels/models/capped_cylinder.py (modified) (1 diff)

sasmodels/models/capped_cylinder.py

@@ -115 +115 @@
 title = "Right circular cylinder with spherical end caps and uniform SLD"
 description = """That is, a sphereocylinder
-        with end caps that have a radius larger than
-        that of the cylinder and the center of the
-        end cap radius lies within the cylinder.
-        Note: As the length of cylinder -->0,
-        it becomes a ConvexLens.
-        It must be that radius <(=) cap_radius.
-        [Parameters];
-        scale: volume fraction of spheres,
-        background:incoherent background,
-        radius: radius of the cylinder,
-        length: length of the cylinder,
-        cap_radius: radius of the semi-spherical cap,
-        sld: SLD of the capped cylinder,
-        solvent_sld: SLD of the solvent.
+    with end caps that have a radius larger than
+    that of the cylinder and the center of the
+    end cap radius lies within the cylinder.
+    Note: As the length of cylinder -->0,
+    it becomes a ConvexLens.
+    It must be that radius <(=) cap_radius.
+    [Parameters];
+    scale: volume fraction of spheres,
+    background:incoherent background,
+    radius: radius of the cylinder,
+    length: length of the cylinder,
+    cap_radius: radius of the semi-spherical cap,
+    sld: SLD of the capped cylinder,
+    solvent_sld: SLD of the solvent.
 """
 category = "shape:cylinder"
 
-parameters = [
-    #   [ "name", "units", default, [lower, upper], "type",
-    #     "description" ],
-    [ "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" ],
-    [ "radius", "Ang",  20, [0, inf], "volume",
-      "Cylinder radius" ],
-    # TODO: use an expression for cap radius with fixed bounds.
-    # The current form requires cap radius R bigger than cylinder radius r.
-    # Could instead use R/r in [1,inf], r/R in [0,1], or the angle between
-    # cylinder and cap in [0,90].  The problem is similar for the barbell
-    # model.  Propose r/R in [0,1] in both cases, with the model specifying
-    # cylinder radius in the capped cylinder model and sphere radius in the
-    # barbell model.  This leads to the natural value of zero for no cap
-    # 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" ],
-    [ "length", "Ang",  400, [0, inf], "volume",
-      "Cylinder length" ],
-    [ "theta", "degrees", 60, [-inf, inf], "orientation",
-      "In plane angle" ],
-    [ "phi", "degrees", 60, [-inf, inf], "orientation",
-      "Out of plane angle" ],
-    ]
+#             ["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"],
+              ["radius", "Ang", 20, [0, inf], "volume", "Cylinder radius"],
+              # TODO: use an expression for cap radius with fixed bounds.
+              # The current form requires cap radius R bigger than cylinder radius r.
+              # Could instead use R/r in [1,inf], r/R in [0,1], or the angle between
+              # cylinder and cap in [0,90].  The problem is similar for the barbell
+              # model.  Propose r/R in [0,1] in both cases, with the model specifying
+              # cylinder radius in the capped cylinder model and sphere radius in the
+              # barbell model.  This leads to the natural value of zero for no cap
+              # 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"],
+              ["length", "Ang", 400, [0, inf], "volume", "Cylinder length"],
+              ["theta", "degrees", 60, [-inf, inf], "orientation", "In plane angle"],
+              ["phi", "degrees", 60, [-inf, inf], "orientation", "Out of plane angle"],
+             ]
 
-source = [ "lib/J1.c", "lib/gauss76.c", "capped_cylinder.c" ]
+source = ["lib/J1.c", "lib/gauss76.c", "capped_cylinder.c"]
 
-
-demo = dict(
-    scale=1, background=0,
-    sld=6, solvent_sld=1,
-    radius=260, cap_radius=290, length=290,
-    theta=30, phi=15,
-    radius_pd=.2, radius_pd_n=1,
-    cap_radius_pd=.2, cap_radius_pd_n=1,
-    length_pd=.2, length_pd_n=10,
-    theta_pd=15, theta_pd_n=45,
-    phi_pd=15, phi_pd_n=1,
-    )
+demo = dict(scale=1, background=0,
+            sld=6, solvent_sld=1,
+            radius=260, cap_radius=290, length=290,
+            theta=30, phi=15,
+            radius_pd=.2, radius_pd_n=1,
+            cap_radius_pd=.2, cap_radius_pd_n=1,
+            length_pd=.2, length_pd_n=10,
+            theta_pd=15, theta_pd_n=45,
+            phi_pd=15, phi_pd_n=1)
 oldname = 'CappedCylinderModel'
 oldpars = dict(sld='sld_capcyl', solvent_sld='sld_solv',