Changeset ee60aa7 in sasmodels for sasmodels/models/elliptical_cylinder.py

Timestamp:

Sep 10, 2018 4:16:46 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

d299327

Parents:

3f818b2

Message:

clean up effective radius functions; improve mono_gauss_coil accuracy; start moving VR into C

File:

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

sasmodels/models/elliptical_cylinder.py

@@ -123 +123 @@
 source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "elliptical_cylinder.c"]
 have_Fq = True
-effective_radius_type = ["equivalent sphere","average radius","min radius","max radius",
-                         "equivalent circular cross-section","half length","half min dimension","half max dimension","half diagonal"]
+effective_radius_type = [
+    "equivalent sphere", "average radius", "min radius", "max radius",
+    "equivalent circular cross-section",
+    "half length", "half min dimension", "half max dimension", "half diagonal",
+    ]
 
 demo = dict(scale=1, background=0, radius_minor=100, axis_ratio=1.5, length=400.0,
             sld=4.0, sld_solvent=1.0, theta=10.0, phi=20, psi=30,
             theta_pd=10, phi_pd=2, psi_pd=3)
-
-#def ER(radius_minor, axis_ratio, length):
-#    """
-#        Equivalent radius
-#        @param radius_minor: Ellipse minor radius
-#        @param axis_ratio: Ratio of major radius over minor radius
-#        @param length: Length of the cylinder
-#    """
-#    radius = sqrt(radius_minor * radius_minor * axis_ratio)
-#    ddd = 0.75 * radius * (2 * radius * length
-#                           + (length + radius) * (length + pi * radius))
-#    return 0.5 * (ddd) ** (1. / 3.)
 
 def random():