Changeset 8795b6f in sasmodels
- Timestamp:
- Mar 28, 2019 5:25:08 PM (6 years ago)
- Branches:
- master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests
- Children:
- e220acc
- Parents:
- db1d9d5
- Location:
- sasmodels
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/model_test.py
r3709366 r8795b6f 307 307 """Run a single test case.""" 308 308 user_pars, x, y = test[:3] 309 print("PS MODEL PARAMETERS:",[p.id for p in model.info.parameters.call_parameters])309 #print("PS MODEL PARAMETERS:",[p.id for p in model.info.parameters.call_parameters]) 310 310 pars = expand_pars(model.info.parameters, user_pars) 311 311 invalid = invalid_pars(model.info.parameters, pars) -
sasmodels/product.py
ra34b811 r8795b6f 284 284 #print(p_npars,s_npars) 285 285 radius_type_offset = 2+p_npars+s_npars + (1 if have_beta_mode else 0) 286 print(values[radius_type_offset])286 #print(values[radius_type_offset]) 287 287 radius_type = int(values[radius_type_offset]) if have_radius_type else 0 288 288 … … 342 342 # polydispersity distribution slot in the values array due to 343 343 # implementation details in kernel_iq.c. 344 print("R_eff=%d:%g, volfrac=%g, volume ratio=%g"345 % (radius_type, radius_effective, volfrac, volume_ratio))344 #print("R_eff=%d:%g, volfrac=%g, volume ratio=%g" 345 # % (radius_type, radius_effective, volfrac, volume_ratio)) 346 346 if radius_type > 0: 347 347 # set the value to the model R_eff and set the weight to 1 … … 358 358 359 359 # Combine form factor and structure factor 360 print("beta", beta_mode, F1, F2, S)360 #print("beta", beta_mode, F1, F2, S) 361 361 PS = F2 + F1**2*(S-1) if beta_mode else F2*S 362 362 final_result = combined_scale*PS + background
Note: See TracChangeset
for help on using the changeset viewer.