Changeset d277229 in sasmodels for sasmodels/models/core_shell_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/core_shell_cylinder.py
r71b751d rd277229 126 126 source = ["lib/polevl.c", "lib/sas_J1.c", "lib/gauss76.c", "core_shell_cylinder.c"] 127 127 have_Fq = True 128 effective_radius_type = ["equivalent sphere","outer radius","half outer length","half min outer dimension", 129 "half max outer dimension","half outer diagonal"] 128 130 129 def ER(radius, thickness, length):130 """131 Returns the effective radius used in the S*P calculation132 """133 radius = radius + thickness134 length = length + 2 * thickness135 ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius))136 return 0.5 * (ddd) ** (1. / 3.)131 #def ER(radius, thickness, length): 132 # """ 133 # Returns the effective radius used in the S*P calculation 134 # """ 135 # radius = radius + thickness 136 # length = length + 2 * thickness 137 # ddd = 0.75 * radius * (2 * radius * length + (length + radius) * (length + pi * radius)) 138 # return 0.5 * (ddd) ** (1. / 3.) 137 139 138 140 def VR(radius, thickness, length):
Note: See TracChangeset
for help on using the changeset viewer.