Changeset 7e923c2 in sasmodels for sasmodels/modelinfo.py

Timestamp:

Aug 7, 2018 8:45:52 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

1a7ddc9

Parents:

c036ddb (diff), e9b17b18 (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 branch 'master' into beta_approx

File:

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

sasmodels/modelinfo.py

@@ -585 +585 @@
                 Parameter('up:frac_f', '', 0., [0., 1.],
                           'magnetic', 'fraction of spin up final'),
-                Parameter('up:angle', 'degress', 0., [0., 360.],
+                Parameter('up:angle', 'degrees', 0., [0., 360.],
                           'magnetic', 'spin up angle'),
             ])