diff --git a/Doc/UserManual/AppendixPythonEx.tex b/Doc/UserManual/AppendixPythonEx.tex
index 65ba3878e7cb9a12e37924d6502659266e4c1917..0b326794054d3fe738e12eacb2b0e66d695f8bf5 100644
--- a/Doc/UserManual/AppendixPythonEx.tex
+++ b/Doc/UserManual/AppendixPythonEx.tex
@@ -49,7 +49,7 @@ There is no interference between the waves scattered by these particles. The dis
The incident neutron beam is characterized by a wavelength of 1~\AA, and incident angles $\alpha_i=0.2^{\circ}$ and $\phi_i=0^{\circ}$.
-The simulation is performed using the Distorted Wave Born Approximation by omitting by using only the air layer (no substrate). The output intensity generated by this simulation is shown in fig.~\ref{fig:PythonEx1}(b).
+The simulation is performed using the Distorted Wave Born Approximation. The output intensity generated by this simulation is shown in fig.~\ref{fig:PythonEx1}(b).
\begin{figure}[H]
\hfill
@@ -96,7 +96,7 @@ This example simulates cylindrical particles in three different configurations.
In each case the wavelength is equal to 1~\AA and the incident angles to $\alpha_i=0.2^{\circ}$, $\phi_i=0^{\circ}$. There is no interference between the scattered waves.
\subsection{Cylindrical form factor in Born approximation} \label{sec:ex003CylinderBA}
-The sample considered for this example and the output intensity generated using \BornAgain\ are shown in fig.~\ref{fig:PythonEx3BA}(a) and (b), respectively. The cylinders are all identical with a radius and height equal to 5~nm. There is no substrate. The simulation is performed in the Born approximation.
+The sample considered for this example and the output intensity generated using \BornAgain\ are shown in fig.~\ref{fig:PythonEx3BA}(a) and (b), respectively. The cylinders are all identical with a radius and height equal to 5~nm. The simulation is performed in the Born approximation, by using only the air layer (no substrate).
\begin{figure}[H]
\hfill
@@ -380,7 +380,7 @@ The influence of the interference function on the output pattern can be seen by
\end{figure}
\subsection{Triangular ripple}
- The particle are long particles with an asymmetric triangular cross section (see \SecRef{Ripple2}) with $L=100$~nm, $W=20$~nm, $H=4$~nm, an asymmetry coefficent of $-3$~nm. The interference function has the same characteristics as in the previous example.
+ The particles are long particles with an asymmetric triangular cross section (see \SecRef{Ripple2}) with $L=100$~nm, $W=20$~nm, $H=4$~nm, an asymmetry coefficent of $-3$~nm. The interference function has the same characteristics as in the previous example.
\begin{figure}[H]
\hfill
diff --git a/Doc/UserManual/CMakeLists.txt b/Doc/UserManual/CMakeLists.txt
index 8fb58f33530151c3853bb3f6178488e7b5b6b688..3d76def31bd4102c72314ce678cdcde3efbc0ff3 100644
--- a/Doc/UserManual/CMakeLists.txt
+++ b/Doc/UserManual/CMakeLists.txt
@@ -142,8 +142,8 @@ set(UM_IMAGES
Figures/figure_ex003BA.eps
Figures/figure_ex003BASize.eps
Figures/figure_ex003DWBA.eps
- #Figures/figure_ex0041DDL.eps
- #Figures/figure_ex0042DDL.eps
+ Figures/figure_ex0041DDL.eps
+ Figures/figure_ex0042DDLsq.eps
Figures/figure_ex005Disorder1.eps
Figures/figure_ex005Disorder2.eps
Figures/figure_ex005Disorder3.eps
@@ -152,12 +152,12 @@ set(UM_IMAGES
Figures/figure_ex006RotatedPyramids.eps
Figures/figure_ex007CoreShell.eps
Figures/figure_ex008CorrelatedRough.eps
- #Figures/figure_ex009CosRipple2DLat.eps
- #Figures/figure_ex009CosRippleNoInterf.eps
- #Figures/figure_ex009TriRipple2DLat.eps
- #Figures/figure_ex009TriRippleNoInterf.eps
+ Figures/figure_ex009CosRipple2DLat.eps
+ Figures/figure_ex009CosRippleNoInterf.eps
+ Figures/figure_ex009TriRipple2DLat.eps
+ Figures/figure_ex009TriRippleNoInterf.eps
Figures/figure_ex010Beamdiv.eps
- #Figures/BAgeometry_wide.jpg
+ Figures/BAgeometry_wide.jpg
Figures/fig_ex001.jpg
Figures/fig_ex002.jpg
Figures/fig_ex003BA.jpg
@@ -166,16 +166,18 @@ set(UM_IMAGES
Figures/fig_ex005Dis1.jpg
Figures/fig_ex005Dis2.jpg
Figures/fig_ex005Dis3.jpg
- Figures/fig_ex005Dis4.jpg
+ Figures/fig_ex005Dis4rand.jpg
Figures/fig_ex006Pyramids.jpg
Figures/fig_ex006RotatedPyramids.jpg
Figures/fig_ex007Core.jpg
Figures/fig_ex008Rough.jpg
- #Figures/fig_ex009Cos.jpg
- #Figures/fig_ex009Tri.jpg
+ Figures/fig_ex009Cos.jpg
+ Figures/fig_ex009Tri.jpg
Figures/fig_ex010BeamDiv.jpg
- Figures/g_r_1dpara.eps
- Figures/g_r_2dpara.jpg
+ #Figures/g_r_1dpara.eps
+ #Figures/g_r_2dpara.jpg
+ Figures/g_r_2dparasq.jpg
+ Figures/UserAPI_IntensityDataLayout.eps
)
diff --git a/Doc/UserManual/Theory.tex b/Doc/UserManual/Theory.tex
index c5aa23f3555b9cd8192c3340839959df08515fcf..fea281fc8af35a4ce1752bec754208190cc2c06b 100755
--- a/Doc/UserManual/Theory.tex
+++ b/Doc/UserManual/Theory.tex
@@ -295,7 +295,7 @@ def get_sample():
# air layer with particles and substrate form multi layer
air_layer = Layer(m_air)
- air_layer.setLayout(particle_layout)
+ air_layer.addLayout(particle_layout)
substrate_layer = Layer(m_substrate, 0)
multi_layer = MultiLayer()
diff --git a/Doc/UserManual/UserManual.pdf b/Doc/UserManual/UserManual.pdf
index e4093dbeb0b71b9b9c4fc3a8320f7252c272f7d9..d9f36edd74d13c0fec57f69409ff6df1b703e7c5 100644
Binary files a/Doc/UserManual/UserManual.pdf and b/Doc/UserManual/UserManual.pdf differ
diff --git a/GUI/coregui/images/BornAgain.ico b/GUI/coregui/images/BornAgain.ico
index efe62027e6456de4cba63bb36e7b011a42f95bdf..a1f98545603aea6898ed9a4b04b97a0f0339cd3c 100644
Binary files a/GUI/coregui/images/BornAgain.ico and b/GUI/coregui/images/BornAgain.ico differ
diff --git a/GUI/coregui/images/BornAgain_48x48.png b/GUI/coregui/images/BornAgain_48x48.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c14220f7169c9468defe38ef77d6b68a1ad1e2a
Binary files /dev/null and b/GUI/coregui/images/BornAgain_48x48.png differ
diff --git a/GUI/coregui/images/BornAgain_64x64.png b/GUI/coregui/images/BornAgain_64x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc33c68665a80c21168dce6e691c45dee75ce5f
Binary files /dev/null and b/GUI/coregui/images/BornAgain_64x64.png differ
diff --git a/GUI/main/BornAgain.icns b/GUI/main/BornAgain.icns
index d5917010558d69afafc152344638beb6b58aa79e..b27da1c75415b321f1b45d06b678ce4fe04acc40 100644
Binary files a/GUI/main/BornAgain.icns and b/GUI/main/BornAgain.icns differ
diff --git a/GUI/main/BornAgain.ico b/GUI/main/BornAgain.ico
index efe62027e6456de4cba63bb36e7b011a42f95bdf..a1f98545603aea6898ed9a4b04b97a0f0339cd3c 100644
Binary files a/GUI/main/BornAgain.ico and b/GUI/main/BornAgain.ico differ
diff --git a/GUI/main/CMakeLists.txt b/GUI/main/CMakeLists.txt
index f8a5e8a3f0321ea00e250be2594a7083f272857d..d09ddcb0ed91db46ad90d3664c8533651342d80c 100644
--- a/GUI/main/CMakeLists.txt
+++ b/GUI/main/CMakeLists.txt
@@ -150,7 +150,7 @@ Plugins = PlugIns
else()
install (TARGETS ${executable_name} DESTINATION ${destination_bin} COMPONENT Applications)
- set(image_files ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.ico ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns)
+ set(image_files ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.ico ${CMAKE_SOURCE_DIR}/GUI/main/BornAgain.icns ${CMAKE_SOURCE_DIR}/GUI/coregui/images/BornAgain_48x48.png ${CMAKE_SOURCE_DIR}/GUI/coregui/images/BornAgain_64x64.png)
install (FILES ${image_files} DESTINATION ${destination_images} COMPONENT Applications)
endif(APPLE AND CREATE_BUNDLE)