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

Timestamp:

Oct 1, 2016 10:36:48 AM (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_caille.py (modified) (3 diffs)

sasmodels/models/lamellar_stack_caille.py

@@ -40 +40 @@
     \end{align*}
 
-Here $d$ = (repeat) spacing, $\delta$ = bilayer thickness,
+Here $d$ = (repeat) d_spacing, $\delta$ = bilayer thickness,
 the contrast $\Delta\rho$ = SLD(headgroup) - SLD(solvent),
 $K$ = smectic bending elasticity, $B$ = compression modulus, and
@@ -89 +89 @@
     ["thickness",        "Ang",      30.0,  [0, inf],   "volume", "sheet thickness"],
     ["Nlayers",          "",          20,   [0, inf],   "",       "Number of layers"],
-    ["spacing",          "Ang",      400.,  [0.0,inf],  "volume", "d-spacing of Caille S(Q)"],
+    ["d_spacing",        "Ang",      400.,  [0.0,inf],  "volume", "lamellar d-spacing of Caille S(Q)"],
     ["Caille_parameter", "1/Ang^2",    0.1, [0.0,0.8],  "",       "Caille parameter"],
     ["sld",              "1e-6/Ang^2", 6.3, [-inf,inf], "sld",    "layer scattering length density"],
@@ -108 +108 @@
 
 demo = dict(scale=1, background=0,
-            thickness=67., Nlayers=3.75, spacing=200.,
+            thickness=67., Nlayers=3.75, d_spacing=200.,
             Caille_parameter=0.268, sld=1.0, sld_solvent=6.34,
             thickness_pd=0.1, thickness_pd_n=100,
-            spacing_pd=0.05, spacing_pd_n=40)
+            d_spacing_pd=0.05, d_spacing_pd_n=40)
 
 #
 tests = [
     [{'scale': 1.0, 'background': 0.0, 'thickness': 30., 'Nlayers': 20.0,
-      'spacing': 400., 'Caille_parameter': 0.1, 'sld': 6.3,
-      'sld_solvent': 1.0, 'thickness_pd': 0.0, 'spacing_pd': 0.0},
+      'd_spacing': 400., 'Caille_parameter': 0.1, 'sld': 6.3,
+      'sld_solvent': 1.0, 'thickness_pd': 0.0, 'd_spacing_pd': 0.0},
      [0.001], [28895.13397]]
     ]