Changeset b297ba9 in sasmodels for sasmodels/models/elliptical_cylinder.py
 Timestamp:
 Mar 20, 2019 7:03:50 PM (7 months ago)
 Branches:
 master, core_shell_microgels, magnetic_model, ticket1257vesicleproduct, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
 Children:
 4e28511
 Parents:
 0d362b7
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/models/elliptical_cylinder.py
r99658f6 rb297ba9 88 88 L A Feigin and D I Svergun, *Structure Analysis by SmallAngle XRay and 89 89 Neutron Scattering*, Plenum, New York, (1987) [see table 3.4] 90 L. Onsager, Ann. New York Acad. Sci. 51, 627659 (1949). 90 L. Onsager, Ann. New York Acad. Sci. 51, 627659 (1949). 91 91 92 92 Authorship and Verification … … 125 125 have_Fq = True 126 126 effective_radius_type = [ 127 "equivalent cylinder excluded volume", "equivalent volume sphere", "average radius", "min radius", "max radius", 127 "equivalent cylinder excluded volume", 128 "equivalent volume sphere", "average radius", "min radius", "max radius", 128 129 "equivalent circular crosssection", 129 130 "half length", "half min dimension", "half max dimension", "half diagonal", … … 135 136 136 137 def random(): 138 """Return a random parameter set for the model.""" 137 139 # V = pi * radius_major * radius_minor * length; 138 140 volume = 10**np.random.uniform(3, 9) 139 141 length = 10**np.random.uniform(1, 3) 140 142 axis_ratio = 10**np.random.uniform(0, 2) 141 radius_minor = np.sqrt(volume/length/axis_ratio)143 radius_minor = sqrt(volume/length/axis_ratio) 142 144 volfrac = 10**np.random.uniform(4, 2) 143 145 pars = dict( … … 156 158 157 159 tests = [ 158 #[{'radius_minor': 20.0, 'axis_ratio': 1.5, 'length':400.0}, 'ER', 79.89245454155024],159 #[{'radius_minor': 20.0, 'axis_ratio': 1.2, 'length':300.0}, 'VR', 1],160 #[{'radius_minor': 20.0, 'axis_ratio': 1.5, 'length':400.0}, 'ER', 79.89245454155024], 161 #[{'radius_minor': 20.0, 'axis_ratio': 1.2, 'length':300.0}, 'VR', 1], 160 162 161 163 # The SasView test result was 0.00169, with a background of 0.001
Note: See TracChangeset
for help on using the changeset viewer.