Changeset ee60aa7 in sasmodels for sasmodels/models/triaxial_ellipsoid.py
- Timestamp:
- Sep 10, 2018 2:16:46 PM (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:
- d299327
- Parents:
- 3f818b2
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/triaxial_ellipsoid.py
rd277229 ree60aa7 158 158 source = ["lib/sas_3j1x_x.c", "lib/gauss76.c", "triaxial_ellipsoid.c"] 159 159 have_Fq = True 160 effective_radius_type = ["equivalent sphere","min radius", "max radius"] 161 162 def ER(radius_equat_minor, radius_equat_major, radius_polar): 163 """ 164 Returns the effective radius used in the S*P calculation 165 """ 166 from .ellipsoid import ER as ellipsoid_ER 167 168 # now that radii can be in any size order, radii need sorting a,b,c 169 # where a~b and c is either much smaller or much larger 170 radii = np.vstack((radius_equat_major, radius_equat_minor, radius_polar)) 171 radii = np.sort(radii, axis=0) 172 selector = (radii[1] - radii[0]) > (radii[2] - radii[1]) 173 polar = np.where(selector, radii[0], radii[2]) 174 equatorial = np.sqrt(np.where(~selector, radii[0]*radii[1], radii[1]*radii[2])) 175 return ellipsoid_ER(polar, equatorial) 160 effective_radius_type = ["equivalent sphere", "min radius", "max radius"] 176 161 177 162 def random():
Note: See TracChangeset
for help on using the changeset viewer.