Changeset 4b0e1f3 in sasmodels

Timestamp:

Mar 14, 2016 6:34:58 AM (9 years ago)

Author:

smk78

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:

56fac50

Parents:

41c7e68 (diff), bea7acb (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

Conflicts:

sasmodels/generate.py

Files:

• doc/rst_prolog (modified) (1 diff)
• sasmodels/convert.py (modified) (2 diffs)
• sasmodels/generate.py (deleted)
• sasmodels/models/adsorbed_layer.py (modified) (1 diff)
• sasmodels/models/micelle_spherical_core.c (added)
• sasmodels/models/micelle_spherical_core.py (added)
• sasmodels/models/img/adsorbed_layer_1d.jpg (added)

doc/rst_prolog

@@ -50 +50 @@
 .. |cm^-2| replace:: cm\ :sup:`-2`
 .. |cm^3| replace:: cm\ :sup:`3`
+.. |1e15cm^3| replace:: 10\ :sup:`15`\ cm\ :sup:`3`
 .. |cm^-3| replace:: cm\ :sup:`-3`
 .. |sr^-1| replace:: sr\ :sup:`-1`

sasmodels/convert.py

@@ -52 +52 @@
     new model definition end with sld.
     """
-    return dict((p, (v*1e6 if p.endswith('sld') else v))
+    return dict((p, (v*1e6 if p.endswith('sld') else v*1e-15 if 'ndensity' in p else v))
                 for p, v in pars.items())
 
@@ -70 +70 @@
     new model definition end with sld.
     """
-    return dict((p, (v*1e-6 if p.endswith('sld') else v))
+    return dict((p, (v*1e-6 if p.endswith('sld') else v*1e15 if 'ndensity' in p else v))
                 for p, v in pars.items())
 

sasmodels/models/adsorbed_layer.py

@@ -61 +61 @@
     denominator =  (q * q) * (density_poly * density_poly) * radius
     eterm =  exp(-1.0 * (q * q) * (second_moment * second_moment))
-    inten =  deltarhosqrd * ((numerator / denominator) * eterm)
     #scale by 10^10 for units conversion to cm^-1
-    return inten * 1.0e+10
+    inten =  1.0e+10 * deltarhosqrd * ((numerator / denominator) * eterm)
+    return inten * 9.4e-13
 Iq.vectorized =  True  # Iq accepts an array of q values