Changeset 062c56d in sasmodels
 Timestamp:
 Nov 24, 2015 3:41:47 PM (7 years ago)
 Branches:
 master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket1257vesicleproduct, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
 Children:
 b514adf
 Parents:
 5753e4e
 gitauthor:
 Paul Kienzle <pkienzle@…> (11/24/15 15:38:56)
 gitcommitter:
 Paul Kienzle <pkienzle@…> (11/24/15 15:41:47)
 Location:
 sasmodels
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

sasmodels/kernel_template.c
r6ee9d39 r062c56d 125 125 if (weight > cutoff) { 126 126 const double scattering = Iq(qi, IQ_PARAMETERS); 127 if (scattering >= 0.0) { // scattering cannot be negative127 //if (scattering >= 0.0) { // scattering cannot be negative 128 128 ret += weight*scattering; 129 129 norm += weight; … … 133 133 norm_vol += vol_weight; 134 134 #endif 135 }135 //} 136 136 //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); } 137 137 } … … 198 198 199 199 const double scattering = Iqxy(qxi, qyi, IQXY_PARAMETERS); 200 if (scattering >= 0.0) { // scattering cannot be negative200 //if (scattering >= 0.0) { // scattering cannot be negative 201 201 // TODO: use correct angle for spherical correction 202 202 // Definition of theta and phi are probably reversed relative to the … … 219 219 #endif 220 220 norm_vol += vol_weight; 221 }221 //} 222 222 //else { printf("exclude qx,qy,I:%%g,%%g,%%g\n",qi,scattering); } 223 223 } 
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.