Changeset f247314 in sasmodels for sasmodels/product.py
- Timestamp:
- Apr 4, 2016 3:23:23 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:
- ec45c4f
- Parents:
- 204fd9b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/product.py
r3c6d5bc rf247314 42 42 if len(set(p.name for p in pars)) != len(pars): 43 43 raise ValueError("Duplicate parameters in %s and %s"%(p_id)) 44 # For comparison with sasview, determine the old parameters.45 oldname = [p_info['oldname'], s_info['oldname']]46 oldpars = {'scale':'scale_factor'}47 oldpars.update(p_info['oldpars'])48 oldpars.update(s_info['oldpars'])49 50 44 model_info = {} 51 45 model_info['id'] = '*'.join((p_id, s_id)) … … 63 57 #model_info['source'] = [] 64 58 # Iq, Iqxy, form_volume, ER, VR and sesans 65 model_info['oldname'] = oldname66 model_info['oldpars'] = oldpars67 59 model_info['composition'] = ('product', [p_info, s_info]) 68 60 process_parameters(model_info)
Note: See TracChangeset
for help on using the changeset viewer.