Changeset 304c775 in sasmodels for sasmodels/models/cylinder.py

Timestamp:

Oct 25, 2018 5:35:06 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:

39a06c9

Parents:

6d5601c

Message:

provide method for testing Fq results. Refs #1202.

File:

• sasmodels/models/cylinder.py (modified) (2 diffs)

sasmodels/models/cylinder.py

@@ -167 +167 @@
             phi_pd=10, phi_pd_n=5)
 
+# pylint: disable=bad-whitespace, line-too-long
 qx, qy = 0.2 * np.cos(2.5), 0.2 * np.sin(2.5)
 # After redefinition of angles, find new tests values.  Was 10 10 in old coords
@@ -180 +181 @@
 ]
 del qx, qy  # not necessary to delete, but cleaner
+
+# Default radius and length
+radius, length = parameters[2][2], parameters[3][2]
+tests.extend([
+    ({'radius_effective_type': 0}, 0.1, None, None, 0., pi*radius**2*length, 1.0),
+    ({'radius_effective_type': 1}, 0.1, None, None, (0.75*radius**2*length)**(1./3.), None, None),
+    ({'radius_effective_type': 2}, 0.1, None, None, radius, None, None),
+    ({'radius_effective_type': 3}, 0.1, None, None, length/2., None, None),
+    ({'radius_effective_type': 4}, 0.1, None, None, min(radius, length/2.), None, None),
+    ({'radius_effective_type': 5}, 0.1, None, None, max(radius, length/2.), None, None),
+    ({'radius_effective_type': 6}, 0.1, None, None, np.sqrt(4*radius**2 + length**2)/2., None, None),
+])
+del radius, length
+# pylint: enable=bad-whitespace, line-too-long
+
 # ADDED by:  RKH  ON: 18Mar2016 renamed sld's etc