Changeset 7c57861 in sasmodels for sasmodels/models/lamellar_hg_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_hg_stack_caille.py (modified) (3 diffs)

sasmodels/models/lamellar_hg_stack_caille.py

@@ -100 +100 @@
     ["Nlayers", "", 30, [0, inf], "",
      "Number of layers"],
-    ["spacing", "Ang", 40., [0.0, inf], "volume",
-     "d-spacing of Caille S(Q)"],
+    ["d_spacing", "Ang", 40., [0.0, inf], "volume",
+     "lamellar d-spacing of Caille S(Q)"],
     ["Caille_parameter", "", 0.001, [0.0, 0.8], "",
      "Caille parameter"],
@@ -125 +125 @@
 demo = dict(
     scale=1, background=0,
-    Nlayers=20, spacing=200., Caille_parameter=0.05,
+    Nlayers=20, d_spacing=200., Caille_parameter=0.05,
     length_tail=15, length_head=10,
     #sld=-1, sld_head=4.0, sld_solvent=6.0,
@@ -131 +131 @@
     length_tail_pd=0.1, length_tail_pd_n=20,
     length_head_pd=0.05, length_head_pd_n=30,
-    spacing_pd=0.2, spacing_pd_n=40,
+    d_spacing_pd=0.2, d_spacing_pd_n=40,
     )
 
 #
 tests = [[{'scale': 1.0, 'background': 0.0, 'length_tail': 10.0, 'length_head': 2.0,
-           'Nlayers': 30.0, 'spacing': 40., 'Caille_parameter': 0.001, 'sld': 0.4,
+           'Nlayers': 30.0, 'd_spacing': 40., 'Caille_parameter': 0.001, 'sld': 0.4,
            'sld_head': 2.0, 'sld_solvent': 6.0, 'length_tail_pd': 0.0,
-           'length_head_pd': 0.0, 'spacing_pd': 0.0}, [0.001], [6838238.571488]]]
+           'length_head_pd': 0.0, 'd_spacing_pd': 0.0}, [0.001], [6838238.571488]]]
 # ADDED by: RKH  ON: 18Mar2016  converted from sasview previously, now renaming everything & sorting the docs