Changeset 513efc5 in sasmodels for sasmodels/models/surface_fractal.py

Timestamp:

Jan 20, 2016 2:50:50 AM (8 years ago)

Author:

piotr

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:

7ed702f

Parents:

30b4ddf

Message:

Code review issues from PK addressed.

Added Taylor expansion utility function.

File:

• sasmodels/models/surface_fractal.py (modified) (3 diffs)

sasmodels/models/surface_fractal.py

@@ -22 +22 @@
 .. math::
 
-    S(q) = \frac{\Gamma(5-D_S)\zeta^{5-D_S}}{\left[1+(q\zeta)^2\right]^{(5-D_S)/2}}
+    S(q) = \frac{\Gamma(5-D_S)\zeta^{5-D_S}}{\left[1+(q\zeta)^2
+    \right]^{(5-D_S)/2}}
     \frac{sin\left[(D_S - 5) tan^{-1}(q\zeta) \right]}{q}
 
@@ -33 +34 @@
     V = \frac{4}{3}\pi R^3
 
-where $R$ is the radius of the building block, $D_S$ is the **surface** fractal dimension,
-$\zeta$ is the cut-off length, $\rho_{solvent}$ is the scattering length density of the solvent,
+where $R$ is the radius of the building block, $D_S$ is the **surface** fractal
+dimension,$\zeta$ is the cut-off length, $\rho_{solvent}$ is the scattering
+length density of the solvent,
 and $\rho_{particle}$ is the scattering length density of particles.
 
 .. note::
     The surface fractal dimension $D_s$ is only valid if $1<surface\_dim<3$.
-    It is also only valid over a limited $q$ range (see the reference for details)
+    It is also only valid over a limited $q$ range (see the reference for
+    details)
 
 
@@ -78 +81 @@
 
 #             ["name", "units", default, [lower, upper], "type","description"],
-parameters = [["radius",        "Ang", 10.0, [0, inf],   "", "Particle radius"],
-              ["surface_dim",   "",    2.0,  [0, inf],   "", "Surface fractal dimension"],
-              ["cutoff_length", "Ang", 500., [0.0, inf], "",  "Cut-off Length"],
+parameters = [["radius",        "Ang", 10.0, [0, inf],   "",
+               "Particle radius"],
+              ["surface_dim",   "",    2.0,  [0, inf],   "",
+               "Surface fractal dimension"],
+              ["cutoff_length", "Ang", 500., [0.0, inf], "",
+               "Cut-off Length"],
               ]
 
 
-source = ["surface_fractal.c"]
+source = ["lib/J1c.c", "surface_fractal.c"]
 
 demo = dict(scale=1, background=0,