From 925b873a472d29173cff7598869103caf383917c Mon Sep 17 00:00:00 2001 From: Hadaq in Frankfurt Date: Mon, 4 Feb 2013 11:44:54 +0100 Subject: [PATCH] fixed Latex errors, JM --- timing trigger case 1.tdml | 163 ++++++++++++++++++++++++++++++++++ timing trigger case 2.tdml | 157 ++++++++++++++++++++++++++++++++ timing trigger case 3.tdml | 167 ++++++++++++++++++++++++++++++++++ timing trigger case 4.tdml | 159 +++++++++++++++++++++++++++++++++ timing trigger case 5.tdml | 177 +++++++++++++++++++++++++++++++++++++ timing trigger case 6.tdml | 177 +++++++++++++++++++++++++++++++++++++ trb3/CodeRepository.tex | 14 +-- trb3/main.tex | 5 +- trb3/trb3qs_daqstartup.tex | 2 +- trb3/trb3qs_preamble.tex | 9 +- trb3/trb3qs_software.tex | 4 +- 11 files changed, 1018 insertions(+), 16 deletions(-) create mode 100644 timing trigger case 1.tdml create mode 100644 timing trigger case 2.tdml create mode 100644 timing trigger case 3.tdml create mode 100644 timing trigger case 4.tdml create mode 100644 timing trigger case 5.tdml create mode 100644 timing trigger case 6.tdml diff --git a/timing trigger case 1.tdml b/timing trigger case 1.tdml new file mode 100644 index 0000000..6c497dc --- /dev/null +++ b/timing trigger case 1.tdml @@ -0,0 +1,163 @@ + + + + + + TimingTool from www.timingtool.com + Timing Diagram Editor + + + + + + timing trigger + + + valid_tmg_trg + + + valid_notmg_trg + + + invalid_trg + + + trg_data_valid + + + trg_release_in + + + spike_detected + + + missing_tmg_trg + + + tmg_trg_timeout + + + multiple_tmg_trg + + + spurious_trg + + + + + timing trigger + + + + + + + + valid_tmg_trg + + + + + + + + + valid_notmg_trg + + + + + + + invalid_trg + + + + + + + trg_data_valid + + + + TRG + + + + + + trg_release_in + + + + + + + + spike_detected + + + + + + + missing_tmg_trg + + + + + + + tmg_trg_timeout + + + + + + + multiple_tmg_trg + + + + + + + spurious_trg + + + + + + + + + > 100 ns + + + + ~ 60 ns + + + + 2 - 5 us + + + + Marker + + + + > 10 ns + + + + + + + + + + document.title + timing trigger case 1 + + diff --git a/timing trigger case 2.tdml b/timing trigger case 2.tdml new file mode 100644 index 0000000..7594a7c --- /dev/null +++ b/timing trigger case 2.tdml @@ -0,0 +1,157 @@ + + + + + + TimingTool from www.timingtool.com + Timing Diagram Editor + + + + + + timing trigger + + + valid_tmg_trg + + + valid_notmg_trg + + + invalid_trg + + + trg_data_valid + + + trg_release_in + + + spike_detected + + + missing_tmg_trg + + + tmp_trg_timeout + + + multiple_tmg_trg + + + spurious_trg + + + + + timing trigger + + + + + + + valid_tmg_trg + + + + + + + valid_notmg_trg + + + + + + + + invalid_trg + + + + + + + trg_data_valid + + + + TTL + + + + + + trg_release_in + + + + + + + + spike_detected + + + + + + + missing_tmg_trg + + + + + + + tmp_trg_timeout + + + + + + + multiple_tmg_trg + + + + + + + spurious_trg + + + + + + + + + Marker + + + + 10 - 20 ns + + + + >10 ns + + target.tick.mark + 4 + + + + + + + + + + + document.title + timing trigger case 2 + + diff --git a/timing trigger case 3.tdml b/timing trigger case 3.tdml new file mode 100644 index 0000000..de3cea0 --- /dev/null +++ b/timing trigger case 3.tdml @@ -0,0 +1,167 @@ + + + + + + TimingTool from www.timingtool.com + Timing Diagram Editor + + + + + + timing trigger + + + valid_tmg_trg + + + valid_notmg_trg + + + invalid_trg + + + trg_data_valid + + + trg_release_in + + + spike_detected + + + missing_tmg_trg + + + tmp_trg_timeout + + + multiple_tmg_trg + + + spurious_trg + + + + + timing trigger + + + + + + + + valid_tmg_trg + + + + + + + + + valid_notmg_trg + + + + + + + + + invalid_trg + + + + + + + trg_data_valid + + + + TTL + + + + + + trg_release_in + + + + + + + + spike_detected + + + + + + + missing_tmg_trg + + + + + + + tmp_trg_timeout + + + + + + + multiple_tmg_trg + + + + + + + spurious_trg + + + + + + + + + + + > 100 ns + + + + ~ 60 ns + + + + Marker + + + + > 10 ns + + + + 10 - 20 ns + + + + + + + + + + document.title + timing trigger case 3 + + diff --git a/timing trigger case 4.tdml b/timing trigger case 4.tdml new file mode 100644 index 0000000..d7c7be3 --- /dev/null +++ b/timing trigger case 4.tdml @@ -0,0 +1,159 @@ + + + + + + TimingTool from www.timingtool.com + Timing Diagram Editor + + + + + + timing trigger + + + valid_tmg_trg + + + valid_notmg_trg + + + invalid_trg + + + trg_data_valid + + + trg_release_in + + + spike_detected + + + missing_tmg_trg + + + tmg_trg_timeout + + + multiple_tmg_trg + + + spurious_trg + + + + + timing trigger + + + + + + + valid_tmg_trg + + + + + + + valid_notmg_trg + + + + + + + invalid_trg + + + + + + + + trg_data_valid + + + + TRG + + + + + + trg_release_in + + + + + + + + spike_detected + + + + + + + missing_tmg_trg + + + + + + + + + tmg_trg_timeout + + + + + + + multiple_tmg_trg + + + + + + + spurious_trg + + + + + + + + + Marker + + + + >10 ns + + target.tick.mark + 4 + + + + + typ. 10 ns + + + + + + + + + + document.title + timing trigger case 4 + + diff --git a/timing trigger case 5.tdml b/timing trigger case 5.tdml new file mode 100644 index 0000000..6c939ce --- /dev/null +++ b/timing trigger case 5.tdml @@ -0,0 +1,177 @@ + + + + + + TimingTool from www.timingtool.com + Timing Diagram Editor + + + + + + timing trigger + + + valid_tmg_trg + + + valid_notmg_trg + + + invalid_trg + + + trg_data_valid + + + trg_release_in + + + spike_detected + + + missing_tmg_trg + + + tmg_trg_timeout + + + multiple_tmg_trg + + + spurious_trg + + + + + timing trigger + + + + + + + + + + valid_tmg_trg + + + + + + + + + + valid_notmg_trg + + + + + + + invalid_trg + + + + + + + trg_data_valid + + + + + TRG + + + + + + trg_release_in + + + + + + + + spike_detected + + + + + + + missing_tmg_trg + + + + + + + tmg_trg_timeout + + + + + + + multiple_tmg_trg + + + + + + + + + spurious_trg + + + + + + + + + > 100 ns + + + + ~ 60 ns + + + + Marker + + + + > 10 ns + + + + > 100 ns + + + + Marker + + + + ~ 60 ns + + + + + + + + + + document.title + timing trigger case 5 + + diff --git a/timing trigger case 6.tdml b/timing trigger case 6.tdml new file mode 100644 index 0000000..b120d7e --- /dev/null +++ b/timing trigger case 6.tdml @@ -0,0 +1,177 @@ + + + + + + TimingTool from www.timingtool.com + Timing Diagram Editor + + + + + + timing trigger + + + valid_tmg_trg + + + valid_notmg_trg + + + invalid_trg + + + trg_data_valid + + + trg_release_in + + + spike_detected + + + missing_tmg_trg + + + tmg_trg_timeout + + + multiple_tmg_trg + + + spurious_trg + + + + + timing trigger + + + + + + + + + + valid_tmg_trg + + + + + + + + + + valid_notmg_trg + + + + + + + invalid_trg + + + + + + + trg_data_valid + + + + + TRG + + + + + + trg_release_in + + + + + + + + spike_detected + + + + + + + + + missing_tmg_trg + + + + + + + tmg_trg_timeout + + + + + + + multiple_tmg_trg + + + + + + + spurious_trg + + + + + + + + + > 100 ns + + + + ~ 60 ns + + + + Marker + + + + > 10 ns + + + + < 40 ns + + + + < 20 ns + + + + Marker + + + + + + + + + + document.title + timing trigger case 6 + + diff --git a/trb3/CodeRepository.tex b/trb3/CodeRepository.tex index 0a68760..dce91c2 100644 --- a/trb3/CodeRepository.tex +++ b/trb3/CodeRepository.tex @@ -1,12 +1,12 @@ \begin{description*} - \item[Trb3 Vhdl]cvs -d lxi051.gsi.de:/misc/hadesprojects/daq/cvsroot/trb3 - \item[TrbNet Vhdl]cvs -d lxi051.gsi.de:/misc/hadesprojects/daq/cvsroot/trbnet + \item[Trb3 Vhdl]~\\cvs -d lxi051.gsi.de:/misc/hadesprojects/daq/cvsroot/trb3 + \item[TrbNet Vhdl]~\\cvs -d lxi051.gsi.de:/misc/hadesprojects/daq/cvsroot/trbnet - \item[Trb3 Documentation]git clone git://jspc29.x-matter.uni-frankfurt.de/projects/daqdocu.git - \item[Trb3 SlowControl Software]git clone git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools.git - \item[Trbnet Software Library]git clone git://jspc29.x-matter.uni-frankfurt.de/projects/trbnettools.git - \item[Data Server (Eventbuilder)]git clone git://jspc29.x-matter.uni-frankfurt.de/projects/daqdata.git + \item[Trb3 Documentation]~\\git clone git://jspc29.x-matter.uni-frankfurt.de/projects/daqdocu.git + \item[Trb3 SlowControl Software]~\\git clone git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools.git + \item[Trbnet Software Library]~\\git clone git://jspc29.x-matter.uni-frankfurt.de/projects/trbnettools.git + \item[Data Server (Eventbuilder)]~\\git clone git://jspc29.x-matter.uni-frankfurt.de/projects/daqdata.git - \item[Dabc Eventbuilder]http://hades-wiki.gsi.de/cgi-bin/view/DaqSlowControl/EventBuilderDabc + \item[Dabc Eventbuilder]~\\http://hades-wiki.gsi.de/cgi-bin/view/DaqSlowControl/EventBuilderDabc \end{description*} diff --git a/trb3/main.tex b/trb3/main.tex index 721933c..90d4fc9 100755 --- a/trb3/main.tex +++ b/trb3/main.tex @@ -89,10 +89,11 @@ \usepackage{remreset} \makeatletter\@removefromreset{footnote}{chapter}\makeatother -% \lstset{ language = VHDL, +% \lstset{ language = bash, % numbers =left, % stepnumber =1, -% frame =single, +% frame =none, +% linewidth = \textwidth, % captionpos=b, % breaklines=true % basicstyle=\small, diff --git a/trb3/trb3qs_daqstartup.tex b/trb3/trb3qs_daqstartup.tex index a0a6405..1b71c6c 100644 --- a/trb3/trb3qs_daqstartup.tex +++ b/trb3/trb3qs_daqstartup.tex @@ -51,7 +51,7 @@ where value for parameter \verb+-S+ should be the same like for \subsection{Starting TRB3} Startup of the whole TRB3 boards system can be encoles in startup script -shown of Listing \ref{start-system} (it is also available in user scripts, +shown of Listing \ref{start_system} (it is also available in user scripts, see Section \ref{sec:userscripts}). First the script updates all TRB3 with proper addresses, next the basic diff --git a/trb3/trb3qs_preamble.tex b/trb3/trb3qs_preamble.tex index 24a37cf..4f8146d 100644 --- a/trb3/trb3qs_preamble.tex +++ b/trb3/trb3qs_preamble.tex @@ -34,16 +34,17 @@ % \usepackage{beramono} \lstset{ + language=bash, basicstyle=\ttfamily, % Standardschrift -% numbers=left, % Ort der Zeilennummern + numbers=left, % Ort der Zeilennummern numberstyle=\tiny, % Stil der Zeilennummern - stepnumber=2, % Abstand zwischen den Zeilennummern +% stepnumber=2, % Abstand zwischen den Zeilennummern numbersep=5pt, % Abstand der Nummern zum Text tabsize=2, % Groesse von Tabs extendedchars=true, % breaklines=true, % Zeilen werden Umgebrochen keywordstyle=\color{red}, - frame=rb, + frame=none, columns=fullflexible, % keywordstyle=[1]\textbf, % Stil der Keywords % keywordstyle=[2]\textbf, % @@ -73,7 +74,7 @@ %\captionsetup[lstlisting]{singlelinecheck=false, labelfont={blue}, textfont={blue}} \usepackage{caption} \DeclareCaptionFont{white}{\color{white}} -\DeclareCaptionFormat{listing}{\colorbox[rgb]{0.8, 0.8, 0.8}{\parbox{\textwidth}{\hspace{15pt}#1#2#3}}} +\DeclareCaptionFormat{listing}{\colorbox[rgb]{0.8, 0.8, 0.8}{\parbox{.98\textwidth}{\hspace{15pt}#1#2#3}}} \captionsetup[lstlisting]{format=listing,singlelinecheck=false, margin=0pt, font={tt}} % \lstinputlisting[label=samplecode,caption=A sample]{sourceCode/HelloWorld.java} \ No newline at end of file diff --git a/trb3/trb3qs_software.tex b/trb3/trb3qs_software.tex index d7d33d8..215dfaa 100644 --- a/trb3/trb3qs_software.tex +++ b/trb3/trb3qs_software.tex @@ -45,7 +45,7 @@ $ export PATH=${PATH}:${HOME}/daqdata/bin % \end{verbatim} If you get errors like -\verb+evtbuild.c:46:38: fatal error: rawapin.h: No such file or directory+ then +\\\verb+evtbuild.c:46:38: fatal error: rawapin.h: No such file or directory+\\ then edit file \verb+evtbuild.c+, comment out \verb+#define RFIO+ and repeat last command (the \verb+for+ loop). @@ -87,7 +87,7 @@ The next task is to setup all necessary registers in the TRB3, which include TRBNet addresses and Ethernet-MAC-destination addresses. Example: -\begin{lstlisting}[label=,caption=setup_trb46.sh] +\begin{lstlisting}[label=,caption=setup\_trb46.sh] ##### TRBNET ##### # set the TRBNet addresses of the Endpoints -- 2.51.0