Changeset 9b79f29 in sasmodels for sasmodels/models/core_shell_bicelle.py

Timestamp:

Apr 8, 2017 7:48:49 AM (7 years ago)

Author:

richardh

Branches:

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

Children:

48438f9

Parents:

737679d

Message:

more docs change for new rotation angles

File:

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

sasmodels/models/core_shell_bicelle.py

@@ -47 +47 @@
 .. math::
 
-        \begin{align}    
+    \begin{align}    
     F(Q,\alpha) = &\bigg[ 
     (\rho_c - \rho_f) V_c \frac{2J_1(QRsin \alpha)}{QRsin\alpha}\frac{sin(QLcos\alpha/2)}{Q(L/2)cos\alpha} \\
@@ -69 +69 @@
 .. figure:: img/cylinder_angle_definition.jpg
 
-    Definition of the angles for the oriented core shell bicelle tmodel.
+    Definition of the angles for the oriented core shell bicelle model,
+    note that the cylinder axis of the bicelle starts along the beam direction
+    when $\theta  = \phi = 0$.
 
 
@@ -135 +137 @@
     ["sld_rim",        "1e-6/Ang^2", 4, [-inf, inf], "sld",         "Cylinder rim scattering length density"],
     ["sld_solvent",    "1e-6/Ang^2", 1, [-inf, inf], "sld",         "Solvent scattering length density"],
-    ["theta",          "degrees",   90, [-inf, inf], "orientation", "In plane angle"],
-    ["phi",            "degrees",    0, [-inf, inf], "orientation", "Out of plane angle"],
+    ["theta",          "degrees",   90, [-360, 360], "orientation", "cylinder axis to beam angle"],
+    ["phi",            "degrees",    0, [-360, 360], "orientation", "rotation about beam"]
     ]
 
@@ -160 +162 @@
 qy = q*sin(pi/6.0)
 tests = [[{}, 0.05, 7.4883545957],
-        [{'theta':80., 'phi':10.}, (qx, qy), 2.81048892474 ],
+        [{'theta':80., 'phi':10.}, (qx, qy), 2.81048892474 ]
         ]
 del qx, qy  # not necessary to delete, but cleaner