Changeset 7c57861 in sasmodels for sasmodels/models/lamellar_stack_paracrystal.py

Timestamp:

Oct 1, 2016 12:36:48 PM (8 years ago)

Author:

butler

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

30fbe2e

Parents:

b99734a

Message:

normalize nearest neighbor spaccing dnn, vs bragg spacing d_spacing and
polydispersity in spacing sigma_d

File:

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

sasmodels/models/lamellar_stack_paracrystal.py

@@ -22 +22 @@
 - *Nlayers* is the number of layers $N$,
 
-- *spacing* is the average distance between adjacent layers
+- *d_spacing* is the average distance between adjacent layers
   $\langle D \rangle$, and
 
-- *spacing_polydisp* is the relative standard deviation of the Gaussian
+- *sigma_d* is the relative standard deviation of the Gaussian
   layer distance distribution $\sigma_D / \langle D \rangle$.
 
@@ -115 +115 @@
               ["Nlayers", "", 20, [0, inf], "",
                "Number of layers"],
-              ["spacing", "Ang", 250., [0.0, inf], "",
-               "d-spacing of paracrystal stack"],
-              ["spacing_polydisp", "Ang", 0.0, [0.0, inf], "",
-               "d-spacing polydispersity"],
+              ["d_spacing", "Ang", 250., [0.0, inf], "",
+               "lamellar spacing of paracrystal stack"],
+              ["sigma_d", "Ang", 0.0, [0.0, inf], "",
+               "Sigma (polydispersity) of the lamellar spacing"],
               ["sld", "1e-6/Ang^2", 1.0, [-inf, inf], "sld",
                "layer scattering length density"],
@@ -136 +136 @@
 
 demo = dict(scale=1, background=0,
-            thickness=33, Nlayers=20, spacing=250, spacing_polydisp=0.2,
+            thickness=33, Nlayers=20, d_spacing=250, sigma_d=0.2,
             sld=1.0, sld_solvent=6.34,
             thickness_pd=0.2, thickness_pd_n=40)
@@ -143 +143 @@
 tests = [
     [{'scale': 1.0, 'background': 0.0, 'thickness': 33.,'Nlayers': 20.0,
-      'spacing': 250., 'spacing_polydisp': 0.2, 'sld': 1.0,
+      'd_spacing': 250., 'sigma_d': 0.2, 'sld': 1.0,
       'sld_solvent': 6.34, 'thickness_pd': 0.0, 'thickness_pd_n': 40 },
      [0.001, 0.215268], [21829.3, 0.00487686]],