Changeset 63c6a08 in sasmodels


Ignore:
Timestamp:
Jul 27, 2016 3:54:44 PM (7 years ago)
Author:
Paul Kienzle <pkienzle@…>
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:
3a45c2c, edf06e1
Parents:
ee5d14d
Message:

fix some latex problems

Location:
sasmodels/models
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/binary_hard_sphere.py

    r42356c8 r63c6a08  
    1111.. math:: 
    1212 
    13     \begin{eqnarray} 
    1413    I(q) = (1-x)f_1^2(q) S_{11}(q) + 2[x(1-x)]^{1/2} f_1(q)f_2(q)S_{12}(q) + 
    1514    x\,f_2^2(q)S_{22}(q) 
    16     \end{eqnarray} 
    1715 
    1816where $S_{ij}$ are the partial structure factors and $f_i$ are the scattering 
     
    2321 
    2422.. math:: 
     23    :nowrap: 
    2524 
    26     \begin{eqnarray} 
    27     x &=& \frac{(\phi_2 / \phi)\alpha^3}{(1-(\phi_2/\phi) + (\phi_2/\phi) 
     25    \begin{align} 
     26    x &= \frac{(\phi_2 / \phi)\alpha^3}{(1-(\phi_2/\phi) + (\phi_2/\phi) 
    2827    \alpha^3)} \\ 
    29     \phi &=& \phi_1 + \phi_2 = \text{total volume fraction} \\ 
    30     \alpha &=& R_1/R_2 = \text{size ratio} 
    31     \end{eqnarray} 
     28    \phi &= \phi_1 + \phi_2 = \text{total volume fraction} \\ 
     29    \alpha &= R_1/R_2 = \text{size ratio} 
     30    \end{align} 
    3231 
    3332The 2D scattering intensity is the same as 1D, regardless of the orientation of 
  • sasmodels/models/onion.py

    r42356c8 r63c6a08  
    1616.. math:: 
    1717 
    18     P(q) &= [f]^2 / V_\text{particle} 
     18    P(q) = [f]^2 / V_\text{particle} 
    1919 
    2020where 
    2121 
    2222.. math:: 
    23  
    24     f    &= f_\text{core} 
     23    :nowrap: 
     24 
     25    \begin{align*} 
     26    f &= f_\text{core} 
    2527            + \left(\sum_{\text{shell}=1}^N f_\text{shell}\right) 
    2628            + f_\text{solvent} 
    27  
     29    \end{align*} 
    2830 
    2931The shells are spherically symmetric with particle density $\rho(r)$ and 
     
    3133 
    3234.. math:: 
     35    :nowrap: 
     36 
     37    \begin{align*} 
    3338 
    3439    f_\text{core} 
     
    4449            \rho_\text{solvent}\frac{\sin(qr)}{qr}\,r^2\,\mathrm{d}r 
    4550        &= -3\rho_\text{solvent}V(r_N)\frac{j_1(q r_N)}{q r_N} 
     51    \end{align*} 
    4652 
    4753where the spherical bessel function $j_1$ is 
     
    7278 
    7379.. math:: 
    74  
     80    :nowrap: 
     81 
     82    \begin{align*} 
    7583    f_\text{shell} &= 4 \pi \int_{r_{\text{shell}-1}}^{r_\text{shell}} 
    7684        \left[ B\exp 
     
    8189        + 3CV(r_{\text{shell}}) \frac{j_1(\beta_\text{out})}{\beta_\text{out}} 
    8290        - 3CV(r_{\text{shell}-1}) \frac{j_1(\beta_\text{in})}{\beta_\text{in}} 
     91    \end{align*} 
    8392 
    8493for 
     
    110119 
    111120.. math:: 
    112  
    113  
     121    :nowrap: 
     122 
     123    \begin{align*} 
    114124    f_\text{shell} 
    115125    &= 
     
    132142      +3\rho_\text{out}V(r_\text{shell}) \frac{j_1(qr_\text{out})}{qr_\text{out}} 
    133143      -3\rho_\text{in}V(r_{\text{shell}-1}) \frac{j_1(qr_\text{in})}{qr_\text{in}} 
     144    \end{align*} 
    134145 
    135146For $A = 0$, the exponential function has no dependence on the radius (so that 
  • sasmodels/models/spherical_sld.py

    ree5d14d r63c6a08  
    198198               background = Incoherent background [1/cm] 
    199199        """ 
    200 category = "sphere-based" 
     200category = "shape:sphere" 
    201201 
    202202# pylint: disable=bad-whitespace, line-too-long 
Note: See TracChangeset for help on using the changeset viewer.