Changeset 63d4dd1 in sasmodels for sasmodels/models/pringle.py

Timestamp:

Nov 9, 2018 3:25:10 PM (5 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:

7126c04

Parents:

599993b9 (diff), cf3d0ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'beta_approx' into ticket-1015-gpu-mem-error

File:

• sasmodels/models/pringle.py (modified) (2 diffs)

sasmodels/models/pringle.py

@@ -42 +42 @@
 Karen Edler, Universtiy of Bath, Private Communication. 2012.
 Derivation by Stefan Alexandru Rautu.
+L. Onsager, Ann. New York Acad. Sci. 51, 627-659 (1949).
 
 * **Author:** Andrew Jackson **Date:** 2008
@@ -72 +73 @@
 
 
-source = ["lib/polevl.c", "lib/sas_J0.c", "lib/sas_J1.c", \
+source = ["lib/polevl.c", "lib/sas_J0.c", "lib/sas_J1.c",
           "lib/sas_JN.c", "lib/gauss76.c", "pringle.c"]
-
-def ER(radius, thickness, alpha, beta):
-    """
-    Return equivalent radius (ER)
-    """
-    ddd = 0.75 * radius * (2 * radius * thickness + (thickness + radius) \
-                           * (thickness + pi * radius))
-    return 0.5 * (ddd) ** (1. / 3.)
+effective_radius_type = ["equivalent cylinder excluded volume", "equivalent volume sphere", "radius"]
 
 def random():