Changeset d277229 in sasmodels for sasmodels/models/hollow_cylinder.py
- Timestamp:
- Sep 7, 2018 3:29:38 AM (6 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 3c60146
- Parents:
- 2a12351b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/hollow_cylinder.py
r71b751d rd277229 90 90 source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "hollow_cylinder.c"] 91 91 have_Fq = True 92 effective_radius_type = ["equivalent sphere","outer radius","half length", 93 "half outer min dimension","half outer max dimension","half outer diagonal"] 92 94 93 95 # pylint: disable=W0613 94 def ER(radius, thickness, length):95 """96 :param radius: Cylinder core radius97 :param thickness: Cylinder wall thickness98 :param length: Cylinder length99 :return: Effective radius100 """101 router = radius + thickness102 if router == 0 or length == 0:103 return 0.0104 len1 = router105 len2 = length/2.0106 term1 = len1*len1*2.0*len2/2.0107 term2 = 1.0 + (len2/len1)*(1.0 + 1/len2/2.0)*(1.0 + pi*len1/len2/2.0)108 ddd = 3.0*term1*term2109 diam = pow(ddd, (1.0/3.0))110 return diam96 #def ER(radius, thickness, length): 97 # """ 98 # :param radius: Cylinder core radius 99 # :param thickness: Cylinder wall thickness 100 # :param length: Cylinder length 101 # :return: Effective radius 102 # """ 103 # router = radius + thickness 104 # if router == 0 or length == 0: 105 # return 0.0 106 # len1 = router 107 # len2 = length/2.0 108 # term1 = len1*len1*2.0*len2/2.0 109 # term2 = 1.0 + (len2/len1)*(1.0 + 1/len2/2.0)*(1.0 + pi*len1/len2/2.0) 110 # ddd = 3.0*term1*term2 111 # diam = pow(ddd, (1.0/3.0)) 112 # return diam 111 113 112 114 def VR(radius, thickness, length):
Note: See TracChangeset
for help on using the changeset viewer.