Changeset 217590b in sasmodels for sasmodels/models/fractal_core_shell.py

Timestamp:

Oct 20, 2016 4:48:48 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:

5c94f41

Parents:

2b9e63f

git-author:

Paul Kienzle <pkienzle@…> (10/20/16 16:47:25)

git-committer:

Paul Kienzle <pkienzle@…> (10/20/16 16:48:48)

Message:

fractal, fractal_core_shell: support fractal_dim as low as 0.

File:

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

sasmodels/models/fractal_core_shell.py

@@ -69 +69 @@
     ["sld_solvent", "1e-6/Ang^2", 3.0,  [-inf, inf], "sld",    "Solvent scattering length density"],
     ["volfraction", "",           1.0,  [0.0, inf],  "",       "Volume fraction of building block spheres"],
-    ["fractal_dim",    "",        2.0,  [1.0, 6.0],  "",       "Fractal dimension"],
+    ["fractal_dim",    "",        2.0,  [0.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
 
-source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "lib/core_shell.c", "fractal_core_shell.c"]
+source = ["lib/sph_j1c.c", "lib/sas_gamma.c", "lib/core_shell.c",
+          "lib/fractal_sq.c", "fractal_core_shell.c"]
 
 demo = dict(scale=0.05,