spheroid & triax ellipsoid & manual

SASfit · Mar 12, 2018 · 55704a8 · 55704a8
1 parent 6105002
commit 55704a8
Show file tree

Hide file tree

Showing 48 changed files with 345,203 additions and 334,532 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
diff --git a/doc/images/form_factor/Ellipsoid/Ellipsoide.png b/doc/images/form_factor/Ellipsoid/Ellipsoide.png
diff --git a/doc/images/form_factor/Ellipsoid/Ellipsoide.svg b/doc/images/form_factor/Ellipsoid/Ellipsoide.svg
diff --git a/doc/images/form_factor/Ellipsoid/ellipsoidalShell.png b/doc/images/form_factor/Ellipsoid/ellipsoidalShell.png
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.tex b/doc/manual/SASfit_ch2.tex
@@ -6,8 +6,6 @@ \chapter{Form Factors}
 
 \input{SASfit_ch2_Spheres_Shells.tex}
 \clearpage
-\input{SASfit_ch2_EllipsoidalObj.tex}
-\clearpage
 \input{SASfit_ch2_polymers_micelles.tex}
 \clearpage
 \input{SASfit_ch2_cluster.tex}

diff --git a/doc/manual/SASfit_plugins.tex b/doc/manual/SASfit_plugins.tex
@@ -4,6 +4,7 @@ \chapter{Plugin functions for form factors}
 
 \input{SASfit_pluginsFF_anisotropic.tex}
 \input{SASfit_pluginsFF_spheres_shells.tex}
+\input{SASfit_pluginsFF_elliptical_obj.tex}
 \input{SASfit_pluginsFF_cylindrical_obj.tex}
 \input{SASfit_pluginsFF_magnetic_structures.tex}
 \input{SASfit_pluginsFF_nonparticular.tex}

diff --git a/doc/manual/SASfit_ch2_EllipsoidalObj.tex → ...anual/SASfit_pluginsFF_elliptical_obj.tex b/doc/manual/SASfit_ch2_EllipsoidalObj.tex → ...anual/SASfit_pluginsFF_elliptical_obj.tex
diff --git a/doc/manual/body_shapes_1.cdr b/doc/manual/body_shapes_1.cdr
diff --git a/doc/manual/ellipsoidalShell.png b/doc/manual/ellipsoidalShell.png
diff --git a/doc/manual/sasfit.aux b/doc/manual/sasfit.aux
diff --git a/doc/manual/sasfit.bbl b/doc/manual/sasfit.bbl
@@ -567,6 +567,11 @@ Shiro Ishikawa.
 \newblock Fixed points by a new iteration method.
 \newblock {\em Proc. Amer. Math. Soc.}, 44:147--150, 1974.
 
+\bibitem{Johnson}
+Steven~G. Johnson.
+\newblock multi-dimensional adaptive integration (cubature) in {C},
+  https://github.com/stevengj/cubature, 2017.
+
 \bibitem{Jones1924}
 J.~E. Jones.
 \newblock On the determination of molecular fields. ii. from the equation of
@@ -1057,11 +1062,6 @@ S.~Schwartz, J.E. Cain, E.A. Dratz, and J.K. Blasie.
   multilayers with application to data from retinal rod.
 \newblock {\em Biophysical Journal}, 15:1201 -- 1233, 1975.
 
-\bibitem{Schweins2004}
-Ralf Schweins and Klaus Huber.
-\newblock Particle scattering factor of pearl necklace chains.
-\newblock {\em Macromolecular Symposia}, 211(1):25--42, apr 2004.
-
 \bibitem{Sharma1977}
 R.~V. Sharma and K.~C. Sharma.
 \newblock The structure factor and the transport properties of dense fluids

diff --git a/doc/manual/sasfit.bib b/doc/manual/sasfit.bib
@@ -4829,4 +4829,12 @@ @Article{Kuhn1934
   timestamp = {2017-12-22},
 }
 
+@WWW{Johnson,
+  author    = {Steven G. Johnson},
+  title     = {multi-dimensional adaptive integration (cubature) in {C}, https://github.com/stevengj/cubature},
+  year      = {2017},
+  url       = {https://github.com/stevengj/cubature},
+  timestamp = {2018-03-05},
+}
+
 @Comment{jabref-meta: databaseType:biblatex;}
diff --git a/doc/manual/sasfit.bib.bak b/doc/manual/sasfit.bib.bak
@@ -4812,4 +4812,29 @@ which fits best the experimental molecular weight distribution curves of branche
   timestamp = {2017-12-21},
 }
 
+@Article{Kuhn1934,
+  author    = {Kuhn, Werner},
+  title     = {{\"U}ber die Gestalt fadenf{\"o}rmiger Molek{\"u}le in L{\"o}sungen},
+  journal   = {Kolloid-Zeitschrift},
+  year      = {1934},
+  volume    = {68},
+  number    = {1},
+  month     = {Feb},
+  pages     = {2--15},
+  issn      = {1435-1536},
+  doi       = {10.1007/BF01451681},
+  url       = {https://doi.org/10.1007/BF01451681},
+  abstract  = {Es werden statistische Betrachtungen angestellt betreffend die Form, welche kettenf{\"o}rmig gebaute Molek{\"u}le, welche in einer L{\"o}sung (oder im Gasraum) suspendiert sind, infolge der Valenzwinkelung und der freien Drehbarkeit annehmen k{\"o}nnen.},
+  day       = {01},
+  timestamp = {2017-12-22},
+}
+
+@WWW{Johnson,
+  author    = {Steven G. Johnson},
+  title     = {multi-dimensional adaptive integration (cubature) in C, https://github.com/stevengj/cubature},
+  year      = {2017},
+  url       = {https://github.com/stevengj/cubature},
+  timestamp = {2018-03-05},
+}
+
 @Comment{jabref-meta: databaseType:biblatex;}
diff --git a/doc/manual/sasfit.blg b/doc/manual/sasfit.blg
@@ -3,9 +3,11 @@ The style file: plain.bst
 Database file #1: sasfit.bib
 Warning--entry type for "Hammouda" isn't style-file defined
 --line 1173 of file sasfit.bib
+Warning--entry type for "Johnson" isn't style-file defined
+--line 4832 of file sasfit.bib
 Warning--can't use both author and editor fields in Henderson2000
 Warning--can't use both author and editor fields in Likos2011
 Warning--can't use both author and editor fields in Naegele2004
 Warning--can't use both author and editor fields in Pedersen2002
 Warning--can't use both author and editor fields in Wagner2005
-(There were 6 warnings)
+(There were 7 warnings)