Changeset 7a1143b in sasmodels for sasmodels/product.py
- Timestamp:
- Mar 30, 2016 11:23:04 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:
- 3a45c2c
- Parents:
- fb5914f (diff), d6f5da6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/product.py
r8e0d974 rce896fd 14 14 15 15 from .core import call_ER_VR 16 from .generate import process_parameters17 16 18 17 SCALE=0 … … 64 63 model_info['oldpars'] = oldpars 65 64 model_info['composition'] = ('product', [p_info, s_info]) 66 process_parameters(model_info)67 65 return model_info 68 66 … … 99 97 # a parameter map. 100 98 par_map = {} 101 p_info = p_kernel.info['par type']102 s_info = s_kernel.info['par type']99 p_info = p_kernel.info['par_type'] 100 s_info = s_kernel.info['par_type'] 103 101 vol_pars = set(p_info['volume']) 104 102 if dim == '2d':
Note: See TracChangeset
for help on using the changeset viewer.