Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Kohlbrecher committed Nov 20, 2017
1 parent 0635720 commit e152e93
Show file tree
Hide file tree
Showing 51 changed files with 31,867 additions and 30,580 deletions.
Binary file modified CHANGES.txt
Binary file not shown.
2 changes: 1 addition & 1 deletion doc/manual/DatenRed.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ \section{Correction and Normalization of SANS-Raw data}
\item scattering of the isolated sample $I_S$ \item scattering of the isolated sample $I_S$
\end{enumerate} \end{enumerate}
Furthermore the detector elements can have different efficiencies $\epsilon_i$. Furthermore the detector elements can have different efficiencies $\epsilon_i$.
To determine the differential cross-section of of the sample all the different To determine the differential cross-section of the sample all the different
contribution to the total scattering intensity have to be considered and determined contribution to the total scattering intensity have to be considered and determined
separately by different measurements. The quantity to be known is the scattering separately by different measurements. The quantity to be known is the scattering
contribution of the isolated sample $I_S$, which in general can not be measured directly. contribution of the isolated sample $I_S$, which in general can not be measured directly.
Expand Down
4 changes: 2 additions & 2 deletions doc/manual/SASfit_absInt.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ \section{Fitting absolute intensities}
For fitting a form factor to experimental data one needs next to the size parameter also a For fitting a form factor to experimental data one needs next to the size parameter also a
scaling parameter. For the simplest case this is done by choosing as a distribution function scaling parameter. For the simplest case this is done by choosing as a distribution function
\texttt{Delta}. \texttt{Delta} simply multiplies a constant value $N$ to the form factor. \texttt{Delta}. \texttt{Delta} simply multiplies a constant value $N$ to the form factor.
The meaning and the unit of $N$ now depends on the unit of the cross-section, wether it is The meaning and the unit of $N$ now depends on the unit of the cross-section, whether it is
normalized or not normalized on the sample volume. \SASfit calculates in the case of normalized or not normalized on the sample volume. \SASfit calculates in the case of
a form factor of \texttt{Sphere} with \texttt{Delta} as a distribution function a form factor of \texttt{Sphere} with \texttt{Delta} as a distribution function
\begin{align} \begin{align}
Expand Down Expand Up @@ -339,7 +339,7 @@ \section{Moments of scattering curves and size distribution}
values for each scattering contribution having a size distribution values for each scattering contribution having a size distribution
and also for the sum of all scattering contributions. Next to the and also for the sum of all scattering contributions. Next to the
integral structural parameters also the different moments of the integral structural parameters also the different moments of the
size distribution up the the $8^\textrm{th}$ moment are supplied. size distribution up the $8^\textrm{th}$ moment are supplied.


\section{Volume fractions} \section{Volume fractions}
\label{sec:volumefraction} \label{sec:volumefraction}
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/SASfit_ch2_EllipsoidalObj.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ \subsection{triaxial ellipsoidal core shell structure}
\begin{center} \begin{center}
\includegraphics[width=0.768\textwidth,height=0.588\textwidth]{../images/form_factor/Ellipsoid/triax_ellipsoidal_core_shell.png} \includegraphics[width=0.768\textwidth,height=0.588\textwidth]{../images/form_factor/Ellipsoid/triax_ellipsoidal_core_shell.png}
\end{center} \end{center}
\caption{Form factor of an triaxial ellipsoidal core shell with semi \caption{Form factor of a triaxial ellipsoidal core shell with semi
axis $a$, $b$ and $c$ and a shell thickness $t$.} axis $a$, $b$ and $c$ and a shell thickness $t$.}
\label{fig:I_triax_ellipsoidal_core_shell} \label{fig:I_triax_ellipsoidal_core_shell}
\end{figure} \end{figure}
8 changes: 4 additions & 4 deletions doc/manual/SASfit_ch2_cylindricalObj.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ \subsection{Porod's approximation for a long cylinder \cite{Porod1948}}
\includegraphics[width=0.668\textwidth,height=0.488\textwidth]{../images/form_factor/cylindrical_obj/LongCylinder.png} \includegraphics[width=0.668\textwidth,height=0.488\textwidth]{../images/form_factor/cylindrical_obj/LongCylinder.png}
\end{center} \end{center}
\caption{Scattering intensity of a cylinder with radius $R=10$ nm and lengths of $L=20$ nm \caption{Scattering intensity of a cylinder with radius $R=10$ nm and lengths of $L=20$ nm
and $L=50$ nm. Next to Porod's axproximation for long cylinders also and $L=50$ nm. Next to Porod's approximation for long cylinders also
the exact integral solution is shown for comparison. the exact integral solution is shown for comparison.
The scattering length density contrast is set to 1.} The scattering length density contrast is set to 1.}
\label{fig:LongCylinder} \label{fig:LongCylinder}
Expand Down Expand Up @@ -183,7 +183,7 @@ \subsection{Porod's approximation for a flat cylinder \cite{Porod1948}}
\includegraphics[width=0.668\textwidth,height=0.488\textwidth]{../images/form_factor/cylindrical_obj/FlatCylinder.png} \includegraphics[width=0.668\textwidth,height=0.488\textwidth]{../images/form_factor/cylindrical_obj/FlatCylinder.png}
\end{center} \end{center}
\caption{Scattering intensity of a cylinder with radius $R=10$ nm and lengths of $L=2$ nm \caption{Scattering intensity of a cylinder with radius $R=10$ nm and lengths of $L=2$ nm
and $L=20$ nm. Next to Porod's axproximation for flat cylinders also and $L=20$ nm. Next to Porod's approximation for flat cylinders also
the exact integral solution is shown for comparison. the exact integral solution is shown for comparison.
The scattering length density contrast is set to 1.} The scattering length density contrast is set to 1.}
\label{fig:FlatCylinder} \label{fig:FlatCylinder}
Expand Down Expand Up @@ -233,7 +233,7 @@ \subsection{Porod's approximations for cylinder \cite{Porod1948}}
\includegraphics[width=0.55\textwidth,height=0.4\textwidth]{../images/form_factor/cylindrical_obj/PorodCylinder.png} \includegraphics[width=0.55\textwidth,height=0.4\textwidth]{../images/form_factor/cylindrical_obj/PorodCylinder.png}
\end{center} \end{center}
\caption{Scattering intensity of a cylinder with radius $R=10$ nm and lengths of $L=2$ nm, \caption{Scattering intensity of a cylinder with radius $R=10$ nm and lengths of $L=2$ nm,
$L=20$ nm, and $L=50$ nm. Next to Porod's axproximation for a cylinders also $L=20$ nm, and $L=50$ nm. Next to Porod's approximation for a cylinders also
the exact integral solution is shown for comparison. the exact integral solution is shown for comparison.
The scattering length density contrast is set to 1.} The scattering length density contrast is set to 1.}
\label{fig:PorodCylinder} \label{fig:PorodCylinder}
Expand Down Expand Up @@ -552,7 +552,7 @@ \subsection{partly aligned cylindrical shell \cite{Hayter1984}}
\begin{align} \begin{align}
p(\theta) & = \sum_{l=0,even}^\infty \frac{2l+1}{2} \left\langle P_l\right\rangle\, P_l(\cos(\theta)) p(\theta) & = \sum_{l=0,even}^\infty \frac{2l+1}{2} \left\langle P_l\right\rangle\, P_l(\cos(\theta))
\end{align} \end{align}
Due to the symmetrie $p(\theta)=p(\pi-\theta)$ all terms with odd values for $l$ are zero and only the Due to the symmetry $p(\theta)=p(\pi-\theta)$ all terms with odd values for $l$ are zero and only the
even terms needs to be considered. For this form factor the first three terms up to $l=6$ are implemented. even terms needs to be considered. For this form factor the first three terms up to $l=6$ are implemented.
As $\int_0^\pi p(\theta) \sin\theta \, d\theta =1$ the zero order parameter is one $\left\langle P_0 \right\rangle=1$. As $\int_0^\pi p(\theta) \sin\theta \, d\theta =1$ the zero order parameter is one $\left\langle P_0 \right\rangle=1$.


Expand Down
8 changes: 4 additions & 4 deletions doc/manual/SASfit_ch2_otherObj.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ \subsection{DLS\_Sphere\_RDG} ~\\
signal $g_2(t)-1 = g_1^2(t)$ of a DLS (dynamic light scattering) signal $g_2(t)-1 = g_1^2(t)$ of a DLS (dynamic light scattering)
measurement. The $Q$ dependent contribution to the relaxation measurement. The $Q$ dependent contribution to the relaxation
signal by particles of different radius $R$ is considered by signal by particles of different radius $R$ is considered by
weighting $g_2(t)-1$ with the form factor of sperical particles in weighting $g_2(t)-1$ with the form factor of spherical particles in
Raylay-Debye-Gans approximation: Rayleigh-Debye-Gans approximation:
\begin{align} \begin{align}
I_\text{DLS\_Sphere\_RDG} (t,\eta,T,Q) &= \int\limits_0^\infty N(R) \; K^2_\text{sp}(Q,R) I_\text{DLS\_Sphere\_RDG} (t,\eta,T,Q) &= \int\limits_0^\infty N(R) \; K^2_\text{sp}(Q,R)
\: e^{-D Q^2t} \; dR \: e^{-D Q^2t} \; dR
Expand Down Expand Up @@ -272,8 +272,8 @@ \subsection{SuperParStroboPsi} ~\\
magnetic field due to phase shifts in the amplifier. magnetic field due to phase shifts in the amplifier.
If the neutron polarization can follow adiabatically the varying magnetic field needs to be verified If the neutron polarization can follow adiabatically the varying magnetic field needs to be verified
experimentally. Therefore we introduce here a parameter $a_\text{ad} \in [0;1]$ which takes into account experimentally. Therefore we introduce here a parameter $a_\text{ad} \in [0;1]$ which takes into account
wether ($a_\text{ad}=1$) or not ($a_\text{ad}=0$) the neutron spin adiabatically follows the change whether ($a_\text{ad}=1$) or not ($a_\text{ad}=0$) the neutron spin adiabatically follows the change
of of magnetic field direction ($\text{sgn}(B(t))$). of magnetic field direction ($\text{sgn}(B(t))$).
\begin{align} \begin{align}
\BM{r}_\text{ad} = \BM{r}_\text{ad} =
\left( \left(
Expand Down
6 changes: 3 additions & 3 deletions doc/manual/SASfit_ch2_polymers_micelles.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ \subsection{Gaussian chain}
\includegraphics[width=0.744\textwidth,height=0.823\textwidth]{Walk3d_0.png} \includegraphics[width=0.744\textwidth,height=0.823\textwidth]{Walk3d_0.png}
\end{center} \end{center}
\caption{The underlying model for a polymer chain is an \caption{The underlying model for a polymer chain is an
isotropic random walk on the euclidean lattice $\mathbb{Z}^3$. isotropic random walk on the Euclidean lattice $\mathbb{Z}^3$.
This picture shows three different walks after 10 000 unit steps, This picture shows three different walks after 10 000 unit steps,
all three starting from the origin. \label{fig:RandomWalk3D}} all three starting from the origin. \label{fig:RandomWalk3D}}
\end{figure} \end{figure}
Expand Down Expand Up @@ -99,7 +99,7 @@ \subsection{Gaussian chain}


\SASfit has implemented the generalized form of a Gaussian (\texttt{generalized Gaussian coil}) coil and the standard \SASfit has implemented the generalized form of a Gaussian (\texttt{generalized Gaussian coil}) coil and the standard
Debye formula \texttt{Gauss}. In both cases three version are implemented which only differ in their parametrization of Debye formula \texttt{Gauss}. In both cases three version are implemented which only differ in their parametrization of
the forward scattering. In case of the the Debye-formula also the polydisperse \texttt{GaussPoly} is implemented. the forward scattering. In case of the Debye-formula also the polydisperse \texttt{GaussPoly} is implemented.


\textcolor[rgb]{1.00,1.00,1.00}{Gauss}\\ \textcolor[rgb]{1.00,1.00,1.00}{Gauss}\\
\subsubsection{Gauss \cite{Debye1947}} \subsubsection{Gauss \cite{Debye1947}}
Expand Down Expand Up @@ -212,7 +212,7 @@ \subsubsection{Polydisperse flexible polymers with Gaussian statistics \cite{Ped
\end{figure} \end{figure}


\textcolor[rgb]{1.00,1.00,1.00}{Gauss}\\ \textcolor[rgb]{1.00,1.00,1.00}{Gauss}\\
\subsubsection{generalalized Gaussian coil \cite{Hammouda,Hammouda2012,Hammouda1993,Hammouda2016}} \subsubsection{generalized Gaussian coil \cite{Hammouda,Hammouda2012,Hammouda1993,Hammouda2016}}
\label{sect:generalized_gaussian_coil} \label{sect:generalized_gaussian_coil}
~\\ ~\\
The scattering function for the generalized Gaussian coil is according to eq.\ \ref{eq:generalizedGauss} The scattering function for the generalized Gaussian coil is according to eq.\ \ref{eq:generalizedGauss}
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/SASfit_ch3.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ \subsection{van der Waals one-fluid approximation}
\label{sec:SQvdW1} \label{sec:SQvdW1}
~\\ ~\\
This approximation is similar to the scaling approximation introduced by Gazzillo This approximation is similar to the scaling approximation introduced by Gazzillo
et al. \cite{Gazzillo1999}. The exact formular is given by et al. \cite{Gazzillo1999}. The exact formula is given by
%\begin{subequations} %\begin{subequations}
\begin{align} \begin{align}
\frac{d\sigma_i}{d\Omega}(Q) = \frac{d\sigma_i}{d\Omega}(Q) =
Expand Down
5 changes: 5 additions & 0 deletions doc/manual/SASfit_history.tex
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,10 @@
\appendix{History} \appendix{History}
\begin{description} \begin{description}
\item[201x-xx-xx] \SASfit 0.94.10
\begin{itemize}
\item bug fix in the algorithm for calculating the resolution parameter in case of averaging neighbouring data points
\item plugin implementation of several variants of helices
\end{itemize}
\item[2017-08-16] \SASfit 0.94.9 \item[2017-08-16] \SASfit 0.94.9
\begin{itemize} \begin{itemize}
\item changed scaling of SESANS correlation functions by factor $1/(2\pi)^2$ \item changed scaling of SESANS correlation functions by factor $1/(2\pi)^2$
Expand Down
4 changes: 2 additions & 2 deletions doc/manual/SASfit_pluginsFF_anisotropic.tex
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -726,11 +726,11 @@ \subsubsection{P'(Q): Kholodenko's worm} ~\\
\label{fig:KholodenkoWorm} \label{fig:KholodenkoWorm}
\end{figure} \end{figure}


By using the analogy between Diracs fermions By using the analogy between Dirac's fermions
and semi-flexible polymers and semi-flexible polymers
Kholodenko \cite{kholodenko93} could give a simple expression for the Kholodenko \cite{kholodenko93} could give a simple expression for the
scattering behaviour of wormlike structures. The form factor $P_0(Q)$ resulting scattering behaviour of wormlike structures. The form factor $P_0(Q)$ resulting
from Kholodenkos approach is designed to reproduce from Kholodenko's approach is designed to reproduce
correctly the rigid-rod limit and the random-coil limit. correctly the rigid-rod limit and the random-coil limit.
Defining $x = 3L/l_b$ ($L$: contour length, $l_b$: Kuhn length), it is given by Defining $x = 3L/l_b$ ($L$: contour length, $l_b$: Kuhn length), it is given by
\begin{align} \begin{align}
Expand Down
Loading

0 comments on commit e152e93

Please sign in to comment.