Changes in sasmodels/models/bcc_paracrystal.py [e7e9231:da7b26b] in sasmodels

File:

• sasmodels/models/bcc_paracrystal.py (modified) (6 diffs)

sasmodels/models/bcc_paracrystal.py

@@ -1 +1 @@
 r"""
+.. warning:: This model and this model description are under review following 
+             concerns raised by SasView users. If you need to use this model, 
+             please email help@sasview.org for the latest situation. *The 
+             SasView Developers. September 2018.*
+
 Definition
 ----------
@@ -13 +18 @@
 
     I(q) = \frac{\text{scale}}{V_p} V_\text{lattice} P(q) Z(q)
-
 
 where *scale* is the volume fraction of spheres, $V_p$ is the volume of the
@@ -30 +34 @@
 .. math::
 
-    V_\text{lattice} = \frac{8\pi}{3} \frac{R^3}{\left(2D/\sqrt{3}\right)^3}
+    V_\text{lattice} = \frac{16\pi}{3} \frac{R^3}{\left(D\sqrt{2}\right)^3}
 
 
@@ -97 +101 @@
 
 Authorship and Verification
-----------------------------
+---------------------------
 
 * **Author:** NIST IGOR/DANSE **Date:** pre 2010
-* **Last Modified by:** Paul Butler **Date:** September 16, 2018
-* **Last Reviewed by:** Paul Butler **Date:** September 16, 2018
+* **Last Modified by:** Paul Butler **Date:** September 29, 2016
+* **Last Reviewed by:** Richard Heenan **Date:** March 21, 2016
 """
 
@@ -123 +127 @@
 # pylint: disable=bad-whitespace, line-too-long
 #             ["name", "units", default, [lower, upper], "type","description" ],
-parameters = [["lattice_spacing",         "Ang",       220,    [-inf, inf], "",            "Lattice spacing"],
-              ["lattice_distortion",    "",            0.06, [-inf, inf], "",            "Paracrystal distortion factor"],
+parameters = [["dnn",         "Ang",       220,    [-inf, inf], "",            "Nearest neighbour distance"],
+              ["d_factor",    "",            0.06, [-inf, inf], "",            "Paracrystal distortion factor"],
               ["radius",      "Ang",        40,    [0, inf],    "volume",      "Particle radius"],
               ["sld",         "1e-6/Ang^2",  4,    [-inf, inf], "sld",         "Particle scattering length density"],
@@ -145 +149 @@
     # in this range 'cuz its easy.
     radius = 10**np.random.uniform(1.3, 4)
-    lattice_distortion = 10**np.random.uniform(-2, -0.7)  # sigma_d in 0.01-0.7
-    lattice_spacing_fraction = np.random.beta(a=10, b=1)
-    lattice_spacing = radius*4/np.sqrt(3)/lattice_spacing_fraction
+    d_factor = 10**np.random.uniform(-2, -0.7)  # sigma_d in 0.01-0.7
+    dnn_fraction = np.random.beta(a=10, b=1)
+    dnn = radius*4/np.sqrt(3)/dnn_fraction
     pars = dict(
         #sld=1, sld_solvent=0, scale=1, background=1e-32,
-        lattice_spacing=lattice_spacing,
-        lattice_distortion=lattice_distortion,
+        dnn=dnn,
+        d_factor=d_factor,
         radius=radius,
     )