Changeset a8a1d48 in sasmodels for sasmodels/generate.py

Timestamp:

Mar 5, 2019 10:35:27 AM (5 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

e589e9a

Parents:

e5bbe64 (diff), c1799d3 (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.

git-author:

Paul Kienzle <pkienzle@…> (03/05/19 10:35:27)

git-committer:

GitHub <noreply@…> (03/05/19 10:35:27)

Message:

Set structure factor background default to 0.0. Closes #1157.

File:

• sasmodels/generate.py (modified) (1 diff)

sasmodels/generate.py

@@ -1006 +1006 @@
         pars = model_info.parameters.kernel_parameters
     else:
-        pars = model_info.parameters.COMMON + model_info.parameters.kernel_parameters
+        pars = (model_info.parameters.common_parameters
+                + model_info.parameters.kernel_parameters)
     partable = make_partable(pars)
     subst = dict(id=model_info.id.replace('_', '-'),