Changeset 058460c in sasmodels

Timestamp:

Sep 14, 2017 11:34:36 AM (7 years ago)

Author:

lewis

Branches:

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

Children:

c11d09f, b866abf, 3a45c2c

Parents:

dd4f5ed

Message:

Better error message for invalid P(Q)*S(Q) models

File:

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

sasmodels/product.py

@@ -45 +45 @@
     # structure factor calculator.  Structure factors should not
     # have any magnetic parameters
+    if not len(s_info.parameters.kernel_parameters) >= 2:
+        raise TypeError("S needs {} and {} as its first parameters".format(ER_ID, VF_ID))
     if not s_info.parameters.kernel_parameters[0].id == ER_ID:
-        raise TypeError("S needs %s as first parameter"%ER_ID)
+        raise TypeError("S needs {} as first parameter".format(ER_ID))
     if not s_info.parameters.kernel_parameters[1].id == VF_ID:
-        raise TypeError("S needs %s as second parameter"%VF_ID)
+        raise TypeError("S needs {} as second parameter".format(VF_ID))
     if not s_info.parameters.magnetism_index == []:
         raise TypeError("S should not have SLD parameters")