Changeset 062c56d in sasmodels for sasmodels/kernelpy.py
- Timestamp:
- Nov 24, 2015 1:41:47 PM (8 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:
- b514adf
- Parents:
- 5753e4e
- git-author:
- Paul Kienzle <pkienzle@…> (11/24/15 13:38:56)
- git-committer:
- Paul Kienzle <pkienzle@…> (11/24/15 13:41:47)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/kernelpy.py
r750ffa5 r062c56d 211 211 if w > cutoff: 212 212 I = form(*args) 213 positive = (I >= 0.0)213 #positive = (I >= 0.0) 214 214 215 215 # Note: can precompute spherical correction if theta_index is not … … 219 219 if theta_index >= 0 else 1.0) 220 220 #spherical_correction = 1.0 221 ret += w * I * spherical_correction * positive222 norm += w * positive221 ret += w * I * spherical_correction #* positive 222 norm += w #* positive 223 223 224 224 # Volume normalization. … … 230 230 vol_args = [args[index] for index in vol_index] 231 231 vol_weight = np.prod(weight[vol_weight_index]) 232 vol += vol_weight * form_volume(*vol_args) * positive233 vol_norm += vol_weight * positive232 vol += vol_weight * form_volume(*vol_args) #* positive 233 vol_norm += vol_weight #* positive 234 234 235 235 positive = (vol * vol_norm != 0.0)
Note: See TracChangeset
for help on using the changeset viewer.