Changeset b297ba9 in sasmodels for sasmodels/details.py
- Timestamp:
- Mar 20, 2019 5:03:50 PM (5 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 4e28511
- Parents:
- 0d362b7
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/details.py
r885753a rb297ba9 236 236 npars = kernel.info.parameters.npars 237 237 nvalues = kernel.info.parameters.nvalues 238 scalars = [value for value, _dispersity, _weight in mesh]238 scalars = [value for value, dispersity, weight in mesh] 239 239 # skipping scale and background when building values and weights 240 _values, dispersity, weights= zip(*mesh[2:npars+2]) if npars else ((), (), ())241 #weight s = correct_theta_weights(kernel.info.parameters, dispersity, weights)242 length = np.array([len(w) for w in weight s])240 value, dispersity, weight = zip(*mesh[2:npars+2]) if npars else ((), (), ()) 241 #weight = correct_theta_weights(kernel.info.parameters, dispersity, weight) 242 length = np.array([len(w) for w in weight]) 243 243 offset = np.cumsum(np.hstack((0, length))) 244 244 call_details = make_details(kernel.info, length, offset[:-1], offset[-1]) … … 246 246 data_len = nvalues + 2*sum(len(v) for v in dispersity) 247 247 extra = (32 - data_len%32)%32 248 data = np.hstack((scalars,) + dispersity + weight s+ ZEROS[:extra])248 data = np.hstack((scalars,) + dispersity + weight + ZEROS[:extra]) 249 249 data = data.astype(kernel.dtype) 250 250 is_magnetic = convert_magnetism(kernel.info.parameters, data)
Note: See TracChangeset
for help on using the changeset viewer.