Changeset 5024a56 in sasmodels for sasmodels/models/cylinder.py

Timestamp:

Oct 30, 2018 6:37:19 PM (5 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:

99658f6

Parents:

23df833

Message:

Make sure that the label radius_effective_mode is used throughout

File:

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

sasmodels/models/cylinder.py

@@ -185 +185 @@
 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),
+    ({'radius_effective_mode': 0}, 0.1, None, None, 0., pi*radius**2*length, 1.0),
+    ({'radius_effective_mode': 1}, 0.1, None, None, (0.75*radius**2*length)**(1./3.), None, None),
+    ({'radius_effective_mode': 2}, 0.1, None, None, radius, None, None),
+    ({'radius_effective_mode': 3}, 0.1, None, None, length/2., None, None),
+    ({'radius_effective_mode': 4}, 0.1, None, None, min(radius, length/2.), None, None),
+    ({'radius_effective_mode': 5}, 0.1, None, None, max(radius, length/2.), None, None),
+    ({'radius_effective_mode': 6}, 0.1, None, None, np.sqrt(4*radius**2 + length**2)/2., None, None),
 ])
 del radius, length