Changeset 7e4a633 in sasmodels for sasmodels/models/multilayer_vesicle.py

Timestamp:

Mar 7, 2017 1:12:20 PM (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:

68f45cb

Parents:

f88e248 (diff), 9ae85f0 (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' into ticket-843

File:

• sasmodels/models/multilayer_vesicle.py (modified) (5 diffs)

sasmodels/models/multilayer_vesicle.py

@@ -19 +19 @@
 
 .. math::
-
-    P(q) = \text{scale}\frac{\phi}{V(R_N)} F^2(q) + \text{background}
+    P(q) = \text{scale} \cdot \frac{\phi}{V(R_N)} F^2(q) + \text{background}
 
 where
 
 .. math::
-
      F(q) = (\rho_\text{shell}-\rho_\text{solv}) \sum_{i=1}^{N} \left[
      3V(r_i)\frac{\sin(qr_i) - qr_i\cos(qr_i)}{(qr_i)^3}
@@ -44 +42 @@
 $\rho_\text{solv}$ is the scattering length density of the solvent.
 
+The outer-most shell radius $R_N$ is used as the effective radius
+for $P(Q)$ when $P(Q) * S(Q)$ is applied.
+
+
 The 2D scattering intensity is the same as 1D, regardless of the orientation
 of the q vector which is defined as:
@@ -50 +52 @@
 
     q = \sqrt{q_x^2 + q_y^2}
-
-The outer-most shell radius $R_N$ is used as the effective radius
-for $P(Q)$ when $P(Q) * S(Q)$ is applied.
 
 For information about polarised and magnetic scattering, see
@@ -70 +69 @@
 **Author:** NIST IGOR/DANSE **on:** pre 2010
 
-**Last Modified by:** Piotr Rozyczko**on:** Feb 24, 2016
+**Last Modified by:** Piotr Rozyczko **on:** Feb 24, 2016
 
 **Last Reviewed by:** Paul Butler **on:** March 20, 2016
@@ -106 +105 @@
     ]
 # pylint: enable=bad-whitespace, line-too-long
+
+# TODO: proposed syntax for specifying which parameters can be polydisperse
+#polydispersity = ["radius", "thick_shell"]
 
 source = ["lib/sas_3j1x_x.c", "multilayer_vesicle.c"]