Changeset a006b63 in sasmodels for sasmodels/models/cylinder.py

Timestamp:

Feb 18, 2015 5:04:51 PM (9 years ago)

Author:

jhbakker

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

ff58110, e166cb9, 9c117a2

Parents:

0ac3db5 (diff), ea7ffce (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 'master' of ​https://github.com/SasView/sasmodels

File:

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

sasmodels/models/cylinder.py

@@ -43 +43 @@
 .. figure:: img/orientation2.jpg
 
-    Examples of the angles for oriented pp against the detector plane.
+    Examples of the angles for oriented cylinders against the detector plane.
 
 NB: The 2nd virial coefficient of the cylinder is calculated based on the
@@ -113 +113 @@
 title = "Right circular cylinder with uniform scattering length density."
 description = """
-     P(q)= 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2))
-            /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)]
+     f(q,alpha) = 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2))
+                /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)]
 
-            P(q,alpha)= scale/V*f(q)^(2)+background
+            P(q,alpha)= scale/V*f(q,alpha)^(2)+background
             V: Volume of the cylinder
             R: Radius of the cylinder
@@ -125 +125 @@
             :the ouput is P(q)=scale/V*integral
             from pi/2 to zero of...
-            f(q)^(2)*sin(alpha)*dalpha + background
+            f(q,alpha)^(2)*sin(alpha)*dalpha + background
 """
 
@@ -169 +169 @@
 oldpars=dict(theta='cyl_theta', phi='cyl_phi', sld='sldCyl', solvent_sld='sldSolv')
 
+
+# test values:
+# [
+#   [ {parameters}, q, I(q)],
+#   [ {parameters}, [q], [I(q)] ],
+#   [ {parameters}, [q1, q2, ...], [I(q1), I(q2), ...]],
+
+#   [ {parameters}, (qx, qy), I(qx, Iqy)],
+#   [ {parameters}, [(qx1, qy1), (qx2, qy2), ...], [I(qx1,qy1), I(qx2,qy2), ...],
+#   ...
+# ]
+# Precision defaults to 7 digits (relative) for single, 14 for double
+# May want a limited precision version that checks for 8-n or 15-n digits respectively
+tests = [
+    [{},  0.2, 0.041761386790780453],
+    [{'theta':10.0, 'phi':10.0}, [0.2], [0.041761386790780453]],
+    [{'theta':10.0, 'phi':10.0}, (0.2, 2.5), 0.038176446608393366],
+    [{'theta':10.0, 'phi':10.0}, [(0.2, 2.5)], [0.038176446608393366]],
+    ]
+