diff --git a/Doc/FFCatalog/FFCatalog.pdf b/Doc/FFCatalog/FFCatalog.pdf index 4c7ebc817c2b7c2c65e928aaafd485ba40d17e4a..e4f3a8032e203c04f4b98a6074bebbf2afce3536 100644 Binary files a/Doc/FFCatalog/FFCatalog.pdf and b/Doc/FFCatalog/FFCatalog.pdf differ diff --git a/Doc/FFCatalog/FormFactors.tex b/Doc/FFCatalog/FormFactors.tex index 666a4cf50309b69f33a804584bd53e45526d1bbd..122a937ae2e7569f73907b4cd7a7935523c80704 100644 --- a/Doc/FFCatalog/FormFactors.tex +++ b/Doc/FFCatalog/FormFactors.tex @@ -441,10 +441,12 @@ computed with $R=4$~nm, $H=11$~nm, and $\alpha=75^\circ$, for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).} \end{figure} -\paragraph{History}\strut\\ +\paragraph{History and Derivation}\strut\\ Agrees with \E{Cone} form factor of \IsGISAXS\ \cite[Eq.~2.28]{Laz06} \cite[Eq.~225]{ReLL09}, except for a substitution $z\to\rho$ in our expression for~$F$. +Justification for complex~$q$ in the same way as for the \E{Cylinder} form factor +in \cref{SCylinder}. %=============================================================================== @@ -1017,11 +1019,13 @@ computed with $R=3.5$~nm and $H=9.8$~nm.} % changes very little under tilt ! \end{figure} -\paragraph{History}\strut\\ +\paragraph{History and Derivation}\strut\\ Agrees with the \E{Full spheroid} form factor of \IsGISAXS\ \cite[Eq.~2.37]{Laz06} \cite[Eq.~227]{ReLL09}, with corrected volume formula. -We also discovered a wrong factor of~2 in the \IsGISAXS\ code. +We also found a wrong factor of~2 in the \IsGISAXS\ code. +Justification for complex~$q$ in the same way as for the \E{Cylinder} form factor +in \cref{SCylinder}. %=============================================================================== @@ -1593,10 +1597,12 @@ computed with $R=4.2$~nm and $H=6.1$~nm, for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).} \end{figure} -\paragraph{History}\strut\\ +\paragraph{History and Derivation}\strut\\ Agrees with the \IsGISAXS\ form factor \E{Sphere} \cite[Eq.~2.33]{Laz06} or \E{Truncated sphere} \cite[Eq.~228]{ReLL09}. +Justification for complex~$q$ in the same way as for the \E{Cylinder} form factor +in \cref{SCylinder}. %=============================================================================== @@ -1670,12 +1676,14 @@ computed with $R=3.3$~nm, $H=9.8$~nm, and $f_p=1.8$, for four different tilt angles~$\vartheta$ (rotation around the $y$ axis).} \end{figure} -\paragraph{History}\strut\\ +\paragraph{History and Derivation}\strut\\ Agrees with the \IsGISAXS\ form factor \E{Sphere} \cite[Eq.~2.33]{Laz06} or \E{TruncatedSpheroid} \cite[Eq.~228]{ReLL09}. % Note an erroneous factor~2 in the expression of the volume % in the \Code{IsGISAXS} manual. +Justification for complex~$q$ in the same way as for the \E{Cylinder} form factor +in \cref{SCylinder}. \index{Shape transform!catalogue|)} \index{Form factor!catalogue|)}