Changeset 9f6823b in sasmodels
- Timestamp:
- Aug 2, 2017 4:45:44 PM (7 years ago)
- Branches:
- master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 232bb12
- Parents:
- 883ecf4
- Location:
- sasmodels
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/compare.py
r883ecf4 r9f6823b 730 730 if dtype == 'sasview': 731 731 return eval_sasview(model_info, data) 732 elif dtype is None or dtype.endswith('!'):732 elif dtype is None or not dtype.endswith('!'): 733 733 return eval_opencl(model_info, data, dtype=dtype, cutoff=cutoff) 734 734 else: -
sasmodels/models/core_shell_cylinder.py
r8f04da4 r9f6823b 148 148 # Avoid core,shell radii < 1 149 149 radius = np.random.beta(0.5, 0.5)*(outer_radius-2) + 1 150 thickness = outer_radius - core150 thickness = outer_radius - radius 151 151 length = np.random.uniform(1, 4.7) 152 152 pars = dict( -
sasmodels/models/core_shell_ellipsoid.py
r8f04da4 r9f6823b 155 155 V = 10**np.random.uniform(5, 12) 156 156 outer_polar = 10**np.random.uniform(1.3, 4) 157 outer_equatorial = np.sqrt(V/ radius_polar) # ignore 4/3 pi157 outer_equatorial = np.sqrt(V/outer_polar) # ignore 4/3 pi 158 158 # Use a distribution with a preference for thin shell or thin core 159 159 # Avoid core,shell radii < 1 160 thickness_polar = np.random.beta(0.5, 0.5)*(outer_ _polar-2) + 1160 thickness_polar = np.random.beta(0.5, 0.5)*(outer_polar-2) + 1 161 161 thickness_equatorial = np.random.beta(0.5, 0.5)*(outer_equatorial-2) + 1 162 162 radius_polar = outer_polar - thickness_polar -
sasmodels/models/core_shell_sphere.py
r8f04da4 r9f6823b 105 105 # Avoid core,shell radii < 1 106 106 radius = np.random.beta(0.5, 0.5)*(outer_radius-2) + 1 107 thickness = outer_radius - core107 thickness = outer_radius - radius 108 108 pars = dict( 109 109 radius=radius,
Note: See TracChangeset
for help on using the changeset viewer.