Changeset 7b9e4dd in sasmodels
- Timestamp:
- Aug 15, 2018 6:15:36 PM (6 years ago)
- Branches:
- master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
- Children:
- 6e45516
- Parents:
- d089a00
- Location:
- sasmodels
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/direct_model.py
r1a8c11c r7b9e4dd 31 31 from . import resolution2d 32 32 from .details import make_kernel_args, dispersion_mesh 33 from .modelinfo import DEFAULT_BACKGROUND 33 34 34 35 # pylint: disable=unused-import … … 349 350 350 351 # Need to pull background out of resolution for multiple scattering 351 background = pars.get('background', 0.)352 background = pars.get('background', DEFAULT_BACKGROUND) 352 353 pars = pars.copy() 353 354 pars['background'] = 0. -
sasmodels/modelinfo.py
r1711569 r7b9e4dd 45 45 # Note that scale and background cannot be coordinated parameters whose value 46 46 # depends on the some polydisperse parameter with the current implementation 47 DEFAULT_BACKGROUND = 1e-3 47 48 COMMON_PARAMETERS = [ 48 49 ("scale", "", 1, (0.0, np.inf), "", "Source intensity"), 49 ("background", "1/cm", 1e-3, (-np.inf, np.inf), "", "Source background"),50 ("background", "1/cm", DEFAULT_BACKGROUND, (-np.inf, np.inf), "", "Source background"), 50 51 ] 51 52 assert (len(COMMON_PARAMETERS) == 2
Note: See TracChangeset
for help on using the changeset viewer.