Changeset ea05c87 in sasmodels for sasmodels/models/onion.py

Timestamp:

Apr 4, 2016 6:47:27 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

1e2a1ba

Parents:

9d96649 (diff), ec45c4f (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.

Message:

Merge remote-tracking branch 'origin/master' into polydisp

Conflicts:

sasmodels/models/spherical_sld.py

File:

• sasmodels/models/onion.py (modified) (1 diff)

sasmodels/models/onion.py

@@ -382 +382 @@
     # "A[1]": 0, "A[2]": -1, "A[3]": 1e-4, "A[4]": 1,
     }
-
-oldname = "OnionExpShellModel"
-oldpars = dict(
-    core_sld="sld_core0",
-    core_radius="rad_core0",
-    solvent_sld="sld_solv",
-    n="n_shells",
-    in_sld="sld_in_shell",
-    out_sld="sld_out_shell",
-    A="A_shell",
-    thickness="thick_shell",
-    # func_shell is always 2 in the user interface, so isn't included
-    )