Changeset 0e0e867 in sasmodels

Timestamp:

Nov 4, 2016 11:52:41 AM (8 years ago)

Author:

krzywon

Branches:

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

Children:

96c2b98, 6245e42, 3a45c2c

Parents:

4cdd0cc (diff), d1cfa86 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

sasmodels/models

Files:

• fractal.py (modified) (1 diff)
• cylinder.py (modified) (1 diff)

sasmodels/models/fractal.py

@@ -30 +30 @@
 
 where $\xi$ is the correlation length representing the cluster size and $D_f$
-is the fractal dimension, representing the self similarity of the structure.
+is the fractal dimension, representing the self similarity of the structure. 
+Note that S(q) here goes negative if $D_f$ is too large, and the Gamma function 
+diverges at $D_f$=0 and $D_f$=1.  
 
 **Polydispersity on the radius is provided for.**

sasmodels/models/cylinder.py

@@ -111 +111 @@
 
 #             [ "name", "units", default, [lower, upper], "type", "description"],
-parameters = [["sld", "4e-6/Ang^2", 4, [-inf, inf], "sld",
+parameters = [["sld", "1e-6/Ang^2", 4, [-inf, inf], "sld",
                "Cylinder scattering length density"],
               ["sld_solvent", "1e-6/Ang^2", 1, [-inf, inf], "sld",