Changeset a57b31d in sasmodels

Timestamp:

Mar 3, 2017 4:41:52 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

eb63414

Parents:

1bd1ea2

Message:

lamellar stack caille: implementation assumes one stack, so require Nlayers≥1

Location:

sasmodels/models

Files:

• lamellar_hg_stack_caille.py (modified) (1 diff)
• lamellar_stack_caille.py (modified) (1 diff)

sasmodels/models/lamellar_hg_stack_caille.py

@@ -98 +98 @@
     ["length_head", "Ang", 2, [0, inf], "volume",
      "head thickness"],
-    ["Nlayers", "", 30, [0, inf], "",
+    ["Nlayers", "", 30, [1, inf], "",
      "Number of layers"],
     ["d_spacing", "Ang", 40., [0.0, inf], "volume",

sasmodels/models/lamellar_stack_caille.py

@@ -88 +88 @@
 parameters = [
     ["thickness",        "Ang",      30.0,  [0, inf],   "volume", "sheet thickness"],
-    ["Nlayers",          "",          20,   [0, inf],   "",       "Number of layers"],
+    ["Nlayers",          "",          20,   [1, inf],   "",       "Number of layers"],
     ["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"],