Changeset 9562dd2 in sasmodels

Timestamp:

Mar 28, 2019 11:11:44 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ticket-1257-vesicle-product, ticket_1156, ticket_822_more_unit_tests

Children:

f691fac

Parents:

f942f4d

Message:

fix composite model parameter name test

File:

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

sasmodels/core.py

@@ -376 +376 @@
     # type: () -> None
     """Check that model load works"""
+    from .product import RADIUS_ID, VOLFRAC_ID, STRUCTURE_MODE_ID, RADIUS_MODE_ID
     #Test the the model produces the parameters that we would expect
     model = load_model("cylinder@hardsphere*sphere")
     actual = [p.name for p in model.info.parameters.kernel_parameters]
-    target = ("sld sld_solvent radius length theta phi"
-              " radius_effective volfraction "
-              " structure_factor_mode effective_radius_type"
-              " A_sld A_sld_solvent A_radius").split()
+    target = ["sld", "sld_solvent", "radius", "length", "theta", "phi",
+              RADIUS_ID, VOLFRAC_ID, STRUCTURE_MODE_ID, RADIUS_MODE_ID,
+              "A_sld", "A_sld_solvent", "A_radius"]
     assert target == actual, "%s != %s"%(target, actual)