triaxial elliptical shell

SASfit · Feb 23, 2018 · a3c11a0 · a3c11a0
1 parent cef1f75
commit a3c11a0
Show file tree

Hide file tree

Showing 1,595 changed files with 3,368 additions and 850,591 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
diff --git a/doc/images/form_factor/fractal_series/fractalseries.opj b/doc/images/form_factor/fractal_series/fractalseries.opj
diff --git a/doc/images/form_factor/fractal_series/fractalseries3IQ.eps b/doc/images/form_factor/fractal_series/fractalseries3IQ.eps
diff --git a/doc/images/form_factor/fractal_series/fractalseries3IQ.png b/doc/images/form_factor/fractal_series/fractalseries3IQ.png
diff --git a/doc/images/form_factor/fractal_series/fractalseries3Nx.eps b/doc/images/form_factor/fractal_series/fractalseries3Nx.eps
diff --git a/doc/images/form_factor/fractal_series/fractalseries3Nx.png b/doc/images/form_factor/fractal_series/fractalseries3Nx.png
diff --git a/doc/manual/SASfit_ch2_EllipsoidalObj.tex b/doc/manual/SASfit_ch2_EllipsoidalObj.tex
@@ -124,7 +124,7 @@ \subsection{Ellipsoidal core shell structure}
           \nonumber \\
 j_1(x) &= \frac{\sin(x)-x\cos(x)}{x^2} \nonumber \\
 x_c &= Q \sqrt{a^2\mu^2+b^2(1-\mu^2)} \nonumber \\
-x_c &= Q \sqrt{(a+t)^2\mu^2+(b+t)^2(1-\mu^2)} \nonumber \\
+x_t &= Q \sqrt{(a+t)^2\mu^2+(b+t)^2(1-\mu^2)} \nonumber \\
 V_c &= \frac{4}{3}\pi ab^2 \nonumber \\
 V_t &= \frac{4}{3}\pi (a+t)(b+t)^2 \nonumber
 \end{align}

diff --git a/doc/manual/SASfit_pluginsFF_spheres_shells.tex b/doc/manual/SASfit_pluginsFF_spheres_shells.tex
@@ -362,7 +362,7 @@ \subsection{CoreShellMicrogel}
 1 & \mbox{for } r\leq R-\sigma \\
 1-\frac{1}{2}\frac{\left((r-R)+\sigma\right)^2}{\sigma^2} & \mbox{for } R-\sigma < r \leq R \\
 \frac{1}{2}\frac{\left((R-r)+\sigma\right)^2}{\sigma^2} & \mbox{for } R< r\leq R+\sigma \\
-0 & \mbox{for } r > \leq R+\sigma
+0 & \mbox{for } r > R+\sigma
 \end{cases}
 \label{eq:CoreShellMicrogelProfile}
 \end{align}