Changeset 303d8d6 in sasmodels for sasmodels/resolution.py
- Timestamp:
- Mar 21, 2016 2:49:21 AM (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:
- 4a72d1a, 3a45c2c
- Parents:
- 03cac08
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/resolution.py
ra146eaa r303d8d6 504 504 from scipy.integrate import romberg 505 505 506 if any(k not in form.info['defaults'] for k in pars.keys()):507 keys = set(form.info['defaults'].keys())508 extra = set(pars.keys()) - keys506 par_set = set([p.name for p in form.info['parameters']]) 507 if any(k not in par_set for k in pars.keys()): 508 extra = set(pars.keys()) - par_set 509 509 raise ValueError("bad parameters: [%s] not in [%s]"% 510 510 (", ".join(sorted(extra)), ", ".join(sorted(keys)))) … … 558 558 from scipy.integrate import romberg 559 559 560 if any(k not in form.info['defaults'] for k in pars.keys()):561 keys = set(form.info['defaults'].keys())562 extra = set(pars.keys()) - keys560 par_set = set([p.name for p in form.info['parameters']]) 561 if any(k not in par_set for k in pars.keys()): 562 extra = set(pars.keys()) - par_set 563 563 raise ValueError("bad parameters: [%s] not in [%s]"% 564 564 (", ".join(sorted(extra)), ", ".join(sorted(keys))))
Note: See TracChangeset
for help on using the changeset viewer.