Changeset d8b7efa in sasmodels for sasmodels/models
- Timestamp:
- Mar 27, 2019 4:41:11 AM (5 years ago)
- Branches:
- master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
- Children:
- 0b8a1fc
- Parents:
- 265c657
- Location:
- sasmodels/models
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/models/cylinder.py
r265c657 rd8b7efa 219 219 cyl_vol = calc_volume(parameters[2][2], parameters[3][2]) 220 220 tests.extend([ 221 ({'effective_radius_ mode': 0}, 0.1, None, None, r_effs[0], cyl_vol, 1.0),222 ({'effective_radius_ mode': 1}, 0.1, None, None, r_effs[1], None, None),223 ({'effective_radius_ mode': 2}, 0.1, None, None, r_effs[2], None, None),224 ({'effective_radius_ mode': 3}, 0.1, None, None, r_effs[3], None, None),225 ({'effective_radius_ mode': 4}, 0.1, None, None, r_effs[4], None, None),226 ({'effective_radius_ mode': 5}, 0.1, None, None, r_effs[5], None, None),227 ({'effective_radius_ mode': 6}, 0.1, None, None, r_effs[6], None, None),228 ({'effective_radius_ mode': 7}, 0.1, None, None, r_effs[7], None, None),221 ({'effective_radius_type': 0}, 0.1, None, None, r_effs[0], cyl_vol, 1.0), 222 ({'effective_radius_type': 1}, 0.1, None, None, r_effs[1], None, None), 223 ({'effective_radius_type': 2}, 0.1, None, None, r_effs[2], None, None), 224 ({'effective_radius_type': 3}, 0.1, None, None, r_effs[3], None, None), 225 ({'effective_radius_type': 4}, 0.1, None, None, r_effs[4], None, None), 226 ({'effective_radius_type': 5}, 0.1, None, None, r_effs[5], None, None), 227 ({'effective_radius_type': 6}, 0.1, None, None, r_effs[6], None, None), 228 ({'effective_radius_type': 7}, 0.1, None, None, r_effs[7], None, None), 229 229 ]) 230 230 del r_effs, cyl_vol -
sasmodels/models/sphere.py
r265c657 rd8b7efa 101 101 0.1, 0.7940350343881906], # this is current value, not verified elsewhere yet 102 102 [{"@S": "hardsphere", # hard sphere structure factor 103 "structure_factor_ mode": 1, # decoupling approximation104 "effective_radius_ mode": 1 # equivalent sphere103 "structure_factor_type": 1, # decoupling approximation 104 "effective_radius_type": 1 # equivalent sphere 105 105 }, 0.1, 0.7940350343881906], 106 106 [{"@S": "hardsphere", # hard sphere structure factor 107 "structure_factor_ mode": 2, # - WHY same result?108 "effective_radius_ mode": 2 #107 "structure_factor_type": 2, # - WHY same result? 108 "effective_radius_type": 2 # 109 109 }, 0.1, 0.7940350343881906] 110 110 ]
Note: See TracChangeset
for help on using the changeset viewer.