Changeset 345cc8f in sasmodels for sasmodels/models/fcc_paracrystal.py

Timestamp:

Mar 31, 2019 7:55:49 AM (5 years ago)

Author:

GitHub <noreply@…>

Parents:

1dd78a2b (diff), bd91e8f (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.

git-author:

Paul Kienzle <pkienzle@…> (03/31/19 07:55:49)

git-committer:

GitHub <noreply@…> (03/31/19 07:55:49)

Message:

Merge bd91e8f66b044c54b5d8cb15ae644f1af300e5d2 into 1dd78a2b6501dbd20963af88b80e45c6b89beda5

File:

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

sasmodels/models/fcc_paracrystal.py

@@ -107 +107 @@
 
 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
-* **Source added by :** Steve King **Date:** March 25, 2019
+* **Last Modified by:** Paul Butler **Date:** September 16, 2018
+* **Last Reviewed by:** Paul Butler **Date:** September 16, 2018
 """
 
@@ -131 +130 @@
 # 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"],
@@ -148 +147 @@
     # 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,
     )