Changeset a807206 in sasmodels for sasmodels/models/triaxial_ellipsoid.py
- Timestamp:
- Sep 30, 2016 10:42:06 PM (7 years ago)
- Branches:
- master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- caddb14, 5031ca3
- Parents:
- 2222134
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/triaxial_ellipsoid.py
r42356c8 ra807206 88 88 parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld", 89 89 "Ellipsoid scattering length density"], 90 ["s olvent_sld", "1e-6/Ang^2", 1, [-inf, inf], "sld",90 ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld", 91 91 "Solvent scattering length density"], 92 ["r eq_minor", "Ang", 20, [0, inf], "volume",92 ["radius_equat_minor", "Ang", 20, [0, inf], "volume", 93 93 "Minor equatorial radius"], 94 ["r eq_major", "Ang", 400, [0, inf], "volume",94 ["radius_equat_major", "Ang", 400, [0, inf], "volume", 95 95 "Major equatorial radius"], 96 ["r polar", "Ang", 10, [0, inf], "volume",96 ["radius_polar", "Ang", 10, [0, inf], "volume", 97 97 "Polar radius"], 98 98 ["theta", "degrees", 60, [-inf, inf], "orientation", … … 106 106 source = ["lib/sph_j1c.c", "lib/gauss76.c", "triaxial_ellipsoid.c"] 107 107 108 def ER(r eq_minor, req_major, rpolar):108 def ER(radius_equat_minor, radius_equat_major, radius_polar): 109 109 """ 110 110 Returns the effective radius used in the S*P calculation … … 112 112 import numpy as np 113 113 from .ellipsoid import ER as ellipsoid_ER 114 return ellipsoid_ER(r polar, np.sqrt(req_minor * req_major))114 return ellipsoid_ER(radius_polar, np.sqrt(radius_equat_minor * radius_equat_major)) 115 115 116 116 demo = dict(scale=1, background=0, 117 sld=6, s olvent_sld=1,117 sld=6, sld_solvent=1, 118 118 theta=30, phi=15, psi=5, 119 r eq_minor=25, req_major=36, rpolar=50,120 r eq_minor_pd=0, req_minor_pd_n=1,121 r eq_major_pd=0, req_major_pd_n=1,122 r polar_pd=.2, rpolar_pd_n=30,119 radius_equat_minor=25, radius_equat_major=36, radius_polar=50, 120 radius_equat_minor_pd=0, radius_equat_minor_pd_n=1, 121 radius_equat_major_pd=0, radius_equat_major_pd_n=1, 122 radius_polar_pd=.2, radius_polar_pd_n=30, 123 123 theta_pd=15, theta_pd_n=45, 124 124 phi_pd=15, phi_pd_n=1,
Note: See TracChangeset
for help on using the changeset viewer.