Changeset efb7615 in sasmodels

Timestamp:

Apr 7, 2017 9:31:07 AM (7 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:

2e0c0b0

Parents:

0cd9158

Message:

docs: remove rst macros for greek, etc.

Files:

• doc/rst_prolog (modified) (2 diffs)
• sasmodels/models/fractal_core_shell.py (modified) (2 diffs)

doc/rst_prolog

@@ -3 +3 @@
 
 
-.. |alpha| unicode:: U+03B1
-.. |beta| unicode:: U+03B2
-.. |gamma| unicode:: U+03B3
-.. |delta| unicode:: U+03B4
-.. |epsilon| unicode:: U+03B5
-.. |zeta| unicode:: U+03B6
-.. |eta| unicode:: U+03B7
-.. |theta| unicode:: U+03B8
-.. |iota| unicode:: U+03B9
-.. |kappa| unicode:: U+03BA
-.. |lambda| unicode:: U+03BB
-.. |mu| unicode:: U+03BC
-.. |nu| unicode:: U+03BD
-.. |xi| unicode:: U+03BE
-.. |omicron| unicode:: U+03BF
-.. |pi| unicode:: U+03C0
-.. |rho| unicode:: U+03C1
-.. |sigma| unicode:: U+03C3
-.. |tau| unicode:: U+03C4
-.. |upsilon| unicode:: U+03C5
-.. |phi| unicode:: U+03C6
-.. |chi| unicode:: U+03C7
-.. |psi| unicode:: U+03C8
-.. |omega| unicode:: U+03C9
+    .. |alpha| unicode:: U+03B1
+    .. |beta| unicode:: U+03B2
+    .. |gamma| unicode:: U+03B3
+    .. |delta| unicode:: U+03B4
+    .. |epsilon| unicode:: U+03B5
+    .. |zeta| unicode:: U+03B6
+    .. |eta| unicode:: U+03B7
+    .. |theta| unicode:: U+03B8
+    .. |iota| unicode:: U+03B9
+    .. |kappa| unicode:: U+03BA
+    .. |lambda| unicode:: U+03BB
+    .. |mu| unicode:: U+03BC
+    .. |nu| unicode:: U+03BD
+    .. |xi| unicode:: U+03BE
+    .. |omicron| unicode:: U+03BF
+    .. |pi| unicode:: U+03C0
+    .. |rho| unicode:: U+03C1
+    .. |sigma| unicode:: U+03C3
+    .. |tau| unicode:: U+03C4
+    .. |upsilon| unicode:: U+03C5
+    .. |phi| unicode:: U+03C6
+    .. |chi| unicode:: U+03C7
+    .. |psi| unicode:: U+03C8
+    .. |omega| unicode:: U+03C9
 
 
-.. |biggamma| unicode:: U+0393
-.. |bigdelta| unicode:: U+0394
-.. |bigzeta| unicode:: U+039E
-.. |bigpsi| unicode:: U+03A8
-.. |bigphi| unicode:: U+03A6
-.. |bigsigma| unicode:: U+03A3
-.. |Gamma| unicode:: U+0393
-.. |Delta| unicode:: U+0394
-.. |Zeta| unicode:: U+039E
-.. |Psi| unicode:: U+03A8
+    .. |biggamma| unicode:: U+0393
+    .. |bigdelta| unicode:: U+0394
+    .. |bigzeta| unicode:: U+039E
+    .. |bigpsi| unicode:: U+03A8
+    .. |bigphi| unicode:: U+03A6
+    .. |bigsigma| unicode:: U+03A3
+    .. |Gamma| unicode:: U+0393
+    .. |Delta| unicode:: U+0394
+    .. |Zeta| unicode:: U+039E
+    .. |Psi| unicode:: U+03A8
 
+    .. |drho| replace:: |Delta|\ |rho|
+    .. |equiv| unicode:: U+2261
+    .. |noteql| unicode:: U+2260
+    .. |TM| unicode:: U+2122
+    .. |P0| replace:: P\ :sub:`0`\
+    .. |A2| replace:: A\ :sub:`2`\
 
-.. |drho| replace:: |Delta|\ |rho|
 .. |Ang| unicode:: U+212B
 .. |Ang^-1| replace:: |Ang|\ :sup:`-1`
@@ -57 +62 @@
 .. |cm^-3| replace:: cm\ :sup:`-3`
 .. |sr^-1| replace:: sr\ :sup:`-1`
-.. |P0| replace:: P\ :sub:`0`\
-.. |A2| replace:: A\ :sub:`2`\
 
-
-.. |equiv| unicode:: U+2261
-.. |noteql| unicode:: U+2260
-.. |TM| unicode:: U+2122
 
 

sasmodels/models/fractal_core_shell.py

@@ -24 +24 @@
     \frac{\sin(qr_s)-qr_s\cos(qr_s)}{(qr_s)^3}\right]^2
 
-    S(q) &= 1 + \frac{D_f\ \Gamma\!(D_f-1)}{[1+1/(q\xi)^2]^{(D_f-1)/2}} 
+    S(q) &= 1 + \frac{D_f\ \Gamma\!(D_f-1)}{[1+1/(q\xi)^2]^{(D_f-1)/2}}
     \frac{\sin[(D_f-1)\tan^{-1}(q\xi)]}{(qr_s)^{D_f}}
 
@@ -31 +31 @@
 $\rho_{solv}$ are the scattering length densities of the core, shell, and
 solvent respectively, $r_c$ and $r_s$ are the radius of the core and the radius
-of the whole particle respectively, $D_f$ is the fractal dimension, and |xi| the
+of the whole particle respectively, $D_f$ is the fractal dimension, and $\xi$ the
 correlation length.
- 
+
 Polydispersity of radius and thickness are also provided for.