Changeset 16a8c63 in sasmodels for sasmodels/models/triaxial_ellipsoid.py

Timestamp:

Apr 7, 2017 8:59:30 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

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

Children:

3fd0499, 1f65db5

Parents:

e6ab0d3 (diff), 43ff77c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ticket-852-unit-tests' into ticket-890

File:

• sasmodels/models/triaxial_ellipsoid.py (modified) (4 diffs)

sasmodels/models/triaxial_ellipsoid.py

@@ -86 +86 @@
 The contrast $\Delta\rho$ is defined as SLD(ellipsoid) - SLD(solvent).  In the
 parameters, $R_a$ is the minor equatorial radius, $R_b$ is the major
-equatorial radius, and $R_c$ is the polar radius of the ellipsoid. 
+equatorial radius, and $R_c$ is the polar radius of the ellipsoid.
 
 NB: The 2nd virial coefficient of the triaxial solid ellipsoid is
@@ -117 +117 @@
 """
 
-from numpy import inf
+from numpy import inf, sin, cos, pi
 
 name = "triaxial_ellipsoid"
@@ -157 +157 @@
     from .ellipsoid import ER as ellipsoid_ER
 
-    # now that radii can be in any size order, radii need sorting a,b,c where a~b and c is either much smaller 
+    # now that radii can be in any size order, radii need sorting a,b,c where a~b and c is either much smaller
     # or much larger
     radii = np.vstack((radius_equat_major, radius_equat_minor, radius_polar))
@@ -177 +177 @@
             psi_pd=15, psi_pd_n=1)
 
-# TODO: need some unit tests!
+q = 0.1
+# april 6 2017, rkh add unit tests, NOT compared with any other calc method, assume correct!
+# add 2d test after pull #890
+qx = q*cos(pi/6.0)
+qy = q*sin(pi/6.0)
+tests = [[{}, 0.05, 24.8839548033],
+#        [{'theta':80., 'phi':10.}, (qx, qy), 9999. ],
+        ]
+del qx, qy  # not necessary to delete, but cleaner