Changeset b39bf3b in sasmodels for sasmodels/product.py
- Timestamp:
- Mar 28, 2019 9:46:52 AM (5 years ago)
- Branches:
- master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
- Children:
- d8e81f7
- Parents:
- f942f4d
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/product.py
r0b8a1fc rb39bf3b 284 284 # unless the model doesn't support beta mode, in which case it is first 285 285 have_radius_type = p_info.effective_radius_type is not None 286 #print(p_npars,s_npars) 286 287 radius_type_offset = 2+p_npars+s_npars + (1 if have_beta_mode else 0) 288 print(values[radius_type_offset]) 287 289 radius_type = int(values[radius_type_offset]) if have_radius_type else 0 288 290 … … 342 344 # polydispersity distribution slot in the values array due to 343 345 # implementation details in kernel_iq.c. 344 #print("R_eff=%d:%g, volfrac=%g, volume ratio=%g"345 #% (radius_type, effective_radius, volfrac, volume_ratio))346 print("R_eff=%d:%g, volfrac=%g, volume ratio=%g" 347 % (radius_type, effective_radius, volfrac, volume_ratio)) 346 348 if radius_type > 0: 347 349 # set the value to the model R_eff and set the weight to 1 … … 358 360 359 361 # Combine form factor and structure factor 360 #print("beta", beta_mode, F1, F2, S)362 print("beta", beta_mode, F1, F2, S) 361 363 PS = F2 + F1**2*(S-1) if beta_mode else F2*S 362 364 final_result = combined_scale*PS + background
Note: See TracChangeset
for help on using the changeset viewer.