Changeset 99658f6 in sasmodels for sasmodels/models/hollow_cylinder.py

Timestamp:

Nov 6, 2018 4:10:43 PM (5 years ago)

Author:

grethevj

Branches:

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

Children:

cf3d0ce

Parents:

5024a56

Message:

updated ER functions including cylinder excluded volume, to match 4.x

File:

• sasmodels/models/hollow_cylinder.py (modified) (3 diffs)

sasmodels/models/hollow_cylinder.py

@@ -60 +60 @@
 .. [#] L A Feigin and D I Svergun, *Structure Analysis by Small-Angle X-Ray and
    Neutron Scattering*, Plenum Press, New York, (1987)
+L. Onsager, Ann. New York Acad. Sci. 51, 627-659 (1949). 
 
 Authorship and Verification
@@ -102 +103 @@
 have_Fq = True
 effective_radius_type = [
-    "equivalent sphere", "outer radius", "half length",
+    "excluded volume", "equivalent outer volume sphere", "outer radius", "half length",
     "half outer min dimension", "half outer max dimension",
     "half outer diagonal",
@@ -140 +141 @@
     [{}, 0.00005, 1764.926],
     [{}, 0.1, None, None,
-     (3./4*(radius+thickness)**2*length)**(1./3),  # R_eff from volume
+     0.5*(0.75*(radius+thickness)*(2.0*(radius+thickness)*length + ((radius+thickness) + length)*(pi*(radius+thickness) + length)))**(1./3.),  # R_eff from excluded volume
      pi*((radius+thickness)**2-radius**2)*length,  # shell volume
      (radius+thickness)**2/((radius+thickness)**2 - radius**2), # form:shell ratio