Changeset cc8b183 in sasmodels for sasmodels/models/fcc_paracrystal.py

Timestamp:

Nov 9, 2018 2:12:05 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket_1156

Children:

f752b9b

Parents:

b3f4831 (diff), cf3d0ce (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 'beta_approx' into ticket_1156

File:

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

sasmodels/models/fcc_paracrystal.py

@@ -3 +3 @@
 #note - calculation requires double precision
 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 
+.. 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.*
 
@@ -100 +100 @@
 
 Authorship and Verification
----------------------------
+----------------------------
 
 * **Author:** NIST IGOR/DANSE **Date:** pre 2010
-* **Last Modified by:** Paul Butler **Date:** September 29, 2016
-* **Last Reviewed by:** Richard Heenan **Date:** March 21, 2016
+* **Last Modified by:** Paul Butler **Date:** September 16, 2018
+* **Last Reviewed by:** Paul Butler **Date:** September 16, 2018
 """
 
@@ -123 +123 @@
 # pylint: disable=bad-whitespace, line-too-long
 #             ["name", "units", default, [lower, upper], "type","description"],
-parameters = [["dnn", "Ang", 220, [-inf, inf], "", "Nearest neighbour distance"],
-              ["d_factor", "", 0.06, [-inf, inf], "", "Paracrystal distortion factor"],
+parameters = [["lattice_spacing", "Ang", 220, [-inf, inf], "", "Lattice spacing"],
+              ["lattice_distortion", "", 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"],
@@ -139 +139 @@
     # copied from bcc_paracrystal
     radius = 10**np.random.uniform(1.3, 4)
-    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(2)/dnn_fraction
+    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(2)/lattice_spacing_fraction
     pars = dict(
         #sld=1, sld_solvent=0, scale=1, background=1e-32,
-        dnn=dnn,
-        d_factor=d_factor,
+        latice_spacing=lattice_spacing,
+        lattice_distortion=d_factor,
         radius=radius,
     )