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

Timestamp:

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

39a06c9

Parents:

6d5601c

Message:

provide method for testing Fq results. Refs #1202.

File:

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

sasmodels/models/hollow_cylinder.py

@@ -69 +69 @@
 * **Last Reviewed by:** Paul Butler **Date:** September 06, 2018
 """
+from __future__ import division
 
 import numpy as np
@@ -132 +133 @@
 qx = q*cos(pi/6.0)
 qy = q*sin(pi/6.0)
+radius = parameters[0][2]
+thickness = parameters[1][2]
+length = parameters[2][2]
 # Parameters for unit tests
 tests = [
     [{}, 0.00005, 1764.926],
-#    [{}, 'VR', 0.55555556],
+    [{}, 0.1, None, None,
+     (3./4*(radius+thickness)**2*length)**(1./3),  # R_eff from volume
+     pi*((radius+thickness)**2-radius**2)*length,  # shell volume
+     (radius+thickness)**2/((radius+thickness)**2 - radius**2), # form:shell ratio
+    ],
     [{}, 0.001, 1756.76],
     [{}, (qx, qy), 2.36885476192],