Skip to content
Snippets Groups Projects
Commit 96fd1714 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files

presentations/WR_Maciej_ISYP2011: use common figures

parent d452b593
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
presentations/WR_Maciej_ISYP2011/Makefile
+ 2
− 4
View file @ 96fd1714
......@@ -2,16 +2,14 @@ all : WhiteRabbit.pdf
.PHONY : all clean
WhiteRabbit.pdf : WhiteRabbit.tex figs
WhiteRabbit.pdf : WhiteRabbit.tex
latex $^
latex $^
dvips WhiteRabbit
ps2pdf WhiteRabbit.ps
figs:
$(MAKE) -C fig
clean :
# $(MAKE) clean -C fig
rm -f *.eps *.pdf *.dat *.log *.out *.aux *.dvi *.ps
rm -f *.eps *.pdf *.dat *.log *.out *.aux *.dvi *.ps *.nav *.snm *.toc
presentations/WR_Maciej_ISYP2011/WhiteRabbit.tex
+ 40
− 39
View file @ 96fd1714
......@@ -43,13 +43,14 @@
\usepackage{multimedia}
\usepackage{hyperref}
\usepackage{helvet}
\usepackage[polish,english]{babel}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[polish]{babel}
\usepackage{multirow}
%\usepackage[utf8]{inputenc}
\usepackage{polski}
%\usepackage{polski}
%\usepackage[polish]{babel}
......@@ -116,7 +117,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{center}
\includegraphics[width=1.0\textwidth]{fig/WRcontrol.ps}
\includegraphics[width=1.0\textwidth]{../../figures/applications/CERN/WRcontrol.ps}
\end{center}
\end{frame}
......@@ -136,7 +137,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.6\textwidth}
\begin{center}
\includegraphics[height=1.0\textwidth]{fig/wr_network-new.ps}
\includegraphics[height=1.0\textwidth]{../../figures/network/wr_network-new.ps}
\end{center}
\end{columns}
......@@ -177,7 +178,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.6\textwidth}
\begin{center}
\includegraphics[height=2.5cm]{fig/wrLink.ps}
\includegraphics[height=2.5cm]{../../figures/protocol/wrLink.ps}
\end{center}
\vspace{2cm}
......@@ -185,7 +186,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.4\textwidth}
\begin{center}
\includegraphics[height=2.6cm]{fig/Accuracy_and_precision.ps}
\includegraphics[height=2.6cm]{../../figures/misc/Accuracy_and_precision.ps}
\end{center}
\vspace{1cm}
......@@ -203,7 +204,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
%\beamertemplatesolidbackgroundcolor{black}
\center Sieć White Rabbit
\begin{center}
\includegraphics[width=11.5cm]{fig/wrTopology.eps}
\includegraphics[width=11.5cm]{../../figures/network/wrTopology.eps}
%\includegraphics[height=6cm]{fig/front.eps}
\end{center}
\end{frame}
......@@ -222,7 +223,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\end{itemize}
\column{1.5in}
\includegraphics[height=5.5cm]{fig/ptpMSGs.ps} \\
\includegraphics[height=5.5cm]{../../figures/protocol/ptpMSGs.ps} \\
\small
one-way mean delay: \\
$\mu = \frac{(t_{4}-t_{1}) - (t_{3}-t_{2})}{2}$ \\
......@@ -326,7 +327,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\vspace{0.2cm}
\begin{center}
\includegraphics[height=2.5cm]{fig/delaymodel.eps}
\includegraphics[height=2.5cm]{../../figures/protocol/delaymodel.eps}
\end{center}
\begin{columns}[c]
......@@ -354,7 +355,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Link Delay Model dla światłowodu}
\begin{center}
\includegraphics[height=4cm]{fig/wrLinkModel.eps}
\includegraphics[height=4cm]{../../figures/protocol/wrLinkModel.eps}
\end{center}
\begin{columns}[c]
......@@ -399,7 +400,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\setbeamertemplate{background}{\includegraphics[width=\paperwidth]{fig/wrLinkModel-fdm2.ps}}
\setbeamertemplate{background}{\includegraphics[width=\paperwidth]{../../figures/protocol/wrLinkModel-fdm2.ps}}
\logo{}
\begin{frame}{Fine Delay Measurement}
......@@ -414,7 +415,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Fine Delay Measurement}
\begin{center}
\includegraphics[width=10.0cm]{fig/link_model.eps}
\includegraphics[width=10.0cm]{../../figures/protocol/link_model.eps}
\end{center}
\end{frame}
......@@ -422,7 +423,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%\subsection{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\setbeamertemplate{background}{\includegraphics[width=\paperwidth]{fig/wrLinkModel-fd.ps}}
\setbeamertemplate{background}{\includegraphics[width=\paperwidth]{../../figures/protocol/wrLinkModel-fd.ps}}
\logo{}
\begin{frame}{Fixed Delays Measurement}
......@@ -437,7 +438,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Fixed Delays Measurement}
\begin{center}
\includegraphics[width=10.0cm]{fig/calibration.eps}
\includegraphics[width=10.0cm]{../../figures/misc/calibration.eps}
\end{center}
\end{frame}
......@@ -542,7 +543,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.5\textwidth}
\begin{center}
\includegraphics[width=5.5cm]{fig/wrLinkSetup.eps}
\includegraphics[width=5.5cm]{../../figures/protocol/wrLinkSetup.eps}
\end{center}
......@@ -625,7 +626,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
%{\it [problem with a presentation flow]}
\begin{center}
\includegraphics[width=10cm]{fig/wrCRS2.ps}
\includegraphics[width=10cm]{../../figures/robustness/wrCRS2.ps}
\end{center}
\end{frame}
......@@ -638,7 +639,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
%{\it [problem with a presentation flow]}
\begin{center}
\includegraphics[width=11.8cm]{fig/wrCRS+mBMC.eps}
\includegraphics[width=11.8cm]{../../figures/protocol/wrCRS_plus_mBMC.eps}
\end{center}
\end{frame}
......@@ -649,7 +650,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Testy: synchronizacja w układzie kaskadowym}
\begin{center}
\includegraphics[height=7.0cm]{fig/measSystem.ps}
\includegraphics[height=7.0cm]{../../figures/measurements/measSystem.ps}
\end{center}
\end{frame}
......@@ -659,7 +660,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Testy: synchronizacja w układzie kaskadowym}
\begin{center}
\includegraphics[height=6.0cm]{fig/measResults-new.eps}
\includegraphics[height=6.0cm]{../../figures/measurements/measResults-new.eps}
\end{center}
......@@ -668,10 +669,10 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
%\section{Status}
%\subsection{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Testy: wpływ temperatury na synchronizacje}
\begin{frame}{Testy: wpływ temperatury na synchronizację}
\begin{center}
\includegraphics[height=6.0cm]{fig/meas_system_wrcore.ps}
\includegraphics[height=6.0cm]{../../figures/measurements/meas_system_wrcore.ps}
\end{center}
\end{frame}
......@@ -681,7 +682,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Testy : Delay vs. temperature}
\begin{center}
\includegraphics[width=7cm]{fig/delay_vs_temp.eps}
\includegraphics[width=7cm]{../../figures/measurements/wrpc_delay_vs_temp.eps}
Zakres temperatury: 80 degC
\end{center}
......@@ -693,7 +694,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Testy: Offset vs. temperature}
\begin{center}
\includegraphics[width=7cm]{fig/offset_vs_temp.eps}
\includegraphics[width=7cm]{../../figures/measurements/wrpc_offset_vs_temp.eps}
\end{center}
\begin{itemize}
% \item Measured on reference clocks (125 MHz) bypassing the FPGA.
......@@ -728,7 +729,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Dystrybucja danych kontrolnych}
\begin{center}
\includegraphics[width=1.1\textwidth]{fig/WRControlNetwork.ps}
\includegraphics[width=1.1\textwidth]{../../figures/applications/CERN/WRControlNetwork.ps}
\end{center}
......@@ -739,7 +740,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Wymagania dot. dystrybucji danych w CERN i GSI}
\begin{center}
\includegraphics[width=1.1\textwidth]{fig/WRControlNetwork2.ps}
\includegraphics[width=1.1\textwidth]{../../figures/applications/CERN/WRControlNetwork2.ps}
\end{center}
......@@ -815,7 +816,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.4\textwidth}
\begin{center}
\includegraphics[width=4.5cm]{fig/CommunicationChannel.ps}
\includegraphics[width=4.5cm]{../../figures/robustness/CommunicationChannel.ps}
\end{center}
\vspace{2cm}
......@@ -843,7 +844,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{center}
\includegraphics[width=1.0\textwidth]{fig/FECencoder.ps}
\includegraphics[width=1.0\textwidth]{../../figures/robustness/FECencoder.ps}
\end{center}
\end{frame}
......@@ -868,7 +869,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{itemize}
\item Wykorzystujemy priorytetyzacje przesyłanych danych (IEEE 802.1Q)
\item Wykorzystujemy priorytetyzację przesyłanych danych (IEEE 802.1Q)
\item Najwyższy priorytet dla Control Messages
\item Implementacja switcha zapewnia odpowiednie zasoby
\end{itemize}
......@@ -913,7 +914,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.5\textwidth}
\begin{center}
\includegraphics[width=6cm]{fig/wr_network-new.ps}
\includegraphics[width=6cm]{../../figures/network/wr_network-new.ps}
\end{center}
\vspace{2cm}
......@@ -933,7 +934,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\end{itemize}
\begin{center}
\includegraphics[width=1.0\textwidth]{fig/FECandRSTP.ps}
\includegraphics[width=1.0\textwidth]{../../figures/robustness/FECandRSTP.ps}
\end{center}
......@@ -976,7 +977,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.5\textwidth}
\begin{center}
\includegraphics[width=6cm]{fig/latencyEstimation.ps}
\includegraphics[width=6cm]{../../figures/robustness/latencyEstimation.ps}
\end{center}
......@@ -994,7 +995,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Elementy systemu White Rabbit}
\begin{center}
\includegraphics[width=7cm]{fig/wr_network-new.ps}
\includegraphics[width=7cm]{../../figures/network/wr_network-new.ps}
\end{center}
\end{frame}
......@@ -1005,7 +1006,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{White Rabbit Switch (V2)}
\begin{center}
\includegraphics[width=7.0cm]{fig/wrs_photo.ps}
\includegraphics[width=7.0cm]{../../figures/switch/wrs_v2.ps}
\end{center}
\begin{itemize}
......@@ -1021,7 +1022,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{White Rabbit Switch (V2)}
\begin{center}
\includegraphics[width=7.0cm]{fig/sw_block.ps}
\includegraphics[width=7.0cm]{../../figures/switch/wrs2_sw_block.ps}
\end{center}
......@@ -1046,7 +1047,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\column{.6\textwidth}
\begin{center}
\includegraphics[width=7.0cm]{fig/wr_node_block.eps}
\includegraphics[width=7.0cm]{../../figures/node/wr_node_block.eps}
\end{center}
% \vspace{2cm}
......@@ -1070,7 +1071,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
% \column{.5\textwidth}
\begin{center}
\includegraphics[width=8.0cm]{fig/wrpc.ps}
\includegraphics[width=8.0cm]{../../figures/node/wrpc_v1.ps}
\end{center}
\begin{itemize}
......@@ -1093,7 +1094,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{Simple PCIe FMC carrier (SPEC)}
\begin{center}
\includegraphics[width=8.0cm]{fig/spec_photo.ps}
\includegraphics[width=8.0cm]{../../figures/node/spec_photo.ps}
\end{center}
......@@ -1104,7 +1105,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{frame}{WR-compliant Hardware Kit}
\begin{center}
\includegraphics[width=6cm]{fig/shw_kit}
\includegraphics[width=6cm]{../../figures/node/shw_kit}
\end{center}
\begin{columns}[c]
......@@ -1138,7 +1139,7 @@ Maciej Lipi\'{n}ski %, T.W\l{}ostowski, J.Serrano, P.Alvarez
\begin{center}
% \includegraphics[height=4.0cm]{fig/white_rabbit_by_kyoht.ps}
\includegraphics[height=4.0cm]{fig/WRlogo.ps}
\includegraphics[height=4.0cm]{../../figures/logo/WRlogo.ps}
\end{center}
\end{frame}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment