Changeset 0d0aee1 in sasmodels

Timestamp:

Mar 10, 2016 6:56:38 AM (9 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:

bea7acb

Parents:

5a483877

Message:

Added micelle_spherical_shell

Files:

• doc/rst_prolog (modified) (1 diff)
• sasmodels/convert.py (modified) (2 diffs)
• sasmodels/generate.py (modified) (1 diff)
• sasmodels/models/micelle_spherical_core.c (added)
• sasmodels/models/micelle_spherical_core.py (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/generate.py

@@ -242 +242 @@
     "1/Ang^2": "|Ang^-2|",
     "1e-6/Ang^2": "|1e-6Ang^-2|",
+    "1e15/cm^3": "|1e15cm^3|",
     "degrees": "degree",
     "1/cm": "|cm^-1|",
+    "1/cm^3": "|cm^-3|",
     "Ang/cm": "|Ang*cm^-1|",
+    "Ang^3": "|Ang^3|",
     "": "None",
     }