Changeset 6d96b66 in sasmodels for sasmodels/models/fractal_core_shell.py

Timestamp:

Oct 18, 2016 10:32:18 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:

f0afad2

Parents:

3e8ea5d

Message:

fractal models: handle limits of q=0 and dim=1

File:

• sasmodels/models/fractal_core_shell.py (modified) (1 diff)

sasmodels/models/fractal_core_shell.py

@@ -63 +63 @@
 #   ["name", "units", default, [lower, upper], "type","description"],
 parameters = [
-    ["radius",      "Ang",        60.0, [0, inf],    "volume", "Sphere core radius"],
-    ["thickness",   "Ang",        10.0, [0, inf],    "volume", "Sphere shell thickness"],
+    ["radius",      "Ang",        60.0, [0.0, inf],  "volume", "Sphere core radius"],
+    ["thickness",   "Ang",        10.0, [0.0, inf],  "volume", "Sphere shell thickness"],
     ["sld_core",    "1e-6/Ang^2", 1.0,  [-inf, inf], "sld",    "Sphere core scattering length density"],
     ["sld_shell",   "1e-6/Ang^2", 2.0,  [-inf, inf], "sld",    "Sphere shell scattering length density"],
     ["sld_solvent", "1e-6/Ang^2", 3.0,  [-inf, inf], "sld",    "Solvent scattering length density"],
-    ["volfraction", "",           1.0,  [0, inf],    "",       "Volume fraction of building block spheres"],
-    ["fractal_dim",    "",           2.0,  [-inf, inf], "",       "Fractal dimension"],
-    ["cor_length",  "Ang",      100.0,  [0, inf],    "",       "Correlation length of fractal-like aggregates"]]
+    ["volfraction", "",           1.0,  [0.0, inf],  "",       "Volume fraction of building block spheres"],
+    ["fractal_dim",    "",        2.0,  [1.0, 6.0],  "",       "Fractal dimension"],
+    ["cor_length",  "Ang",      100.0,  [0.0, inf],  "",       "Correlation length of fractal-like aggregates"],
+]
 # pylint: enable=bad-whitespace, line-too-long