add list of trigger collector inputs, remove some outdated parts.

diff --git a/TriggerCollectionConnections.pdf b/TriggerCollectionConnections.pdf
new file mode 100644 (file)
index 0000000..7c3b75d
Binary files /dev/null and b/TriggerCollectionConnections.pdf differ

diff --git a/ebmonitorguide.tex b/ebmonitorguide.tex
index 33aef93e4c5c52d8f12f86bdf71b821691bd2323..d4d3a9d8a8a5d62ca6b443fc26af2f1b3feb73e6 100644 (file)
--- a/ebmonitorguide.tex
+++ b/ebmonitorguide.tex
@@ -143,47 +143,47 @@ It can be stored as bookmark (favourite address) in the browser, so it can be re
 
 
 \clearpage
-
-\subsection{Old EPICS monitor with MEDM}
-\label{sec:ebmonguide:medm}
-Before 2018,the event builder parameters were exported via shared memory to separate EPICS IOCs for each eventbuilder process.
-These process variables were displayed on the MEDM gui clients. In the following Figures (\ref{fig:ebmonitorguide1}, 
-\ref{fig:ebmonitorguide2}, \ref{fig:ebmonitorguide3}, \ref{fig:ebmonitorguide2}),the most important windows of such GUI are explained.
-
-{\bf Please note:} This monitoring was still working both for the old EB software (netmem/evtbuild) and for
-parallel DABC eventbuilders, since most parameters were emulated in DABC to match the previous scheme, although the software mechanisms are different.
-It might still display some reasonable values when used in connection with the improved DABC BNET (builder network), see section \ref{sec:ebmonguide:dabc}.
-However, in this case only the currently active final ''builder'' nodes are shown as active (green lamps). The number of input subsystem refers to the 
-input nodes of the BNET then, not to the number of DAQ GBe hubs. Information on the BNET inputs from the DAQ hubs is not available anymore in the EPICS GUI.
-
-
-
-\begin{figure}[htb]
-       \centering
-               \includegraphics[width=.9\textheight,page=1,angle=90]{ebmonitordescription.pdf}
-       \caption[EB EPICS general GUI]{EB EPICS general GUI}
-       \label{fig:ebmonitorguide1}
-\end{figure}
-
-
-\begin{figure}[htb]
-       \centering
-               \includegraphics[width=.9\textheight,page=2,angle=90]{ebmonitordescription.pdf}
-       \caption[EB EPICS data buffer]{EB EPICS data buffer}
-       \label{fig:ebmonitorguide2}
-\end{figure}
-\begin{figure}[htb]
-       \centering
-               \includegraphics[width=.9\textheight,page=3,angle=90]{ebmonitordescription.pdf}
-       \caption[EB EPICS error statistics]{EB EPICS error statistics}
-       \label{fig:ebmonitorguide3}
-\end{figure}
-\begin{figure}[htb]
-       \centering
-               \includegraphics[width=.9\textheight,page=4,angle=90]{ebmonitordescription.pdf}
-       \caption[EB EPICS network and trigger statistics]{EB EPICS network and trigger statistics}
-       \label{fig:ebmonitorguide4}
-\end{figure}
+% 
+% \subsection{Old EPICS monitor with MEDM}
+% \label{sec:ebmonguide:medm}
+% Before 2018,the event builder parameters were exported via shared memory to separate EPICS IOCs for each eventbuilder process.
+% These process variables were displayed on the MEDM gui clients. In the following Figures (\ref{fig:ebmonitorguide1}, 
+% \ref{fig:ebmonitorguide2}, \ref{fig:ebmonitorguide3}, \ref{fig:ebmonitorguide2}),the most important windows of such GUI are explained.
+% 
+% {\bf Please note:} This monitoring was still working both for the old EB software (netmem/evtbuild) and for
+% parallel DABC eventbuilders, since most parameters were emulated in DABC to match the previous scheme, although the software mechanisms are different.
+% It might still display some reasonable values when used in connection with the improved DABC BNET (builder network), see section \ref{sec:ebmonguide:dabc}.
+% However, in this case only the currently active final ''builder'' nodes are shown as active (green lamps). The number of input subsystem refers to the 
+% input nodes of the BNET then, not to the number of DAQ GBe hubs. Information on the BNET inputs from the DAQ hubs is not available anymore in the EPICS GUI.
+% 
+% 
+% 
+% \begin{figure}[htb]
+%      \centering
+%              \includegraphics[width=.9\textheight,page=1,angle=90]{ebmonitordescription.pdf}
+%      \caption[EB EPICS general GUI]{EB EPICS general GUI}
+%      \label{fig:ebmonitorguide1}
+% \end{figure}
+% 
+% 
+% \begin{figure}[htb]
+%      \centering
+%              \includegraphics[width=.9\textheight,page=2,angle=90]{ebmonitordescription.pdf}
+%      \caption[EB EPICS data buffer]{EB EPICS data buffer}
+%      \label{fig:ebmonitorguide2}
+% \end{figure}
+% \begin{figure}[htb]
+%      \centering
+%              \includegraphics[width=.9\textheight,page=3,angle=90]{ebmonitordescription.pdf}
+%      \caption[EB EPICS error statistics]{EB EPICS error statistics}
+%      \label{fig:ebmonitorguide3}
+% \end{figure}
+% \begin{figure}[htb]
+%      \centering
+%              \includegraphics[width=.9\textheight,page=4,angle=90]{ebmonitordescription.pdf}
+%      \caption[EB EPICS network and trigger statistics]{EB EPICS network and trigger statistics}
+%      \label{fig:ebmonitorguide4}
+% \end{figure}
 
 
 

diff --git a/main.tex b/main.tex
index b92661f6d069727e51427571780c21f69b4d7312..611aea0f5e458e7a0e1a1ae9f5ee24e37ecb0023 100755 (executable)
--- a/main.tex
+++ b/main.tex
@@ -139,9 +139,6 @@
 \section{RICH}
        \input{newrich}
 
-\clearpage
-\section{TOF / RPC / Forward Wall}
-       \input{tof}
 
 \clearpage
 \section{ECal}
@@ -201,6 +198,10 @@
 \part{Outdated Information}
 \appendix
 \input{evtbuild_old}
+\clearpage
+\section{TOF / RPC / Forward Wall}
+       \input{tof}
+
 \clearpage
 \bibliography{biblio}
 

diff --git a/newrich.tex b/newrich.tex
index 6ebb0467e428551b22bb8a3fb6d3bb9cdaa27d5e..3c60a2eca338e957aeac5f1969e0c9772cbd2206 100644 (file)
--- a/newrich.tex
+++ b/newrich.tex
@@ -1,6 +1,6 @@
-\begin{figure}
-  \centering
-    \includegraphics[angle=90,height=0.9\textheight]{newrich_patchpanel.pdf}
-  \caption[newrich_patchpanel]{The Trigger output patchpanel for the new RICH}
-  \label{fig:richsector}
-\end{figure}
\ No newline at end of file
+% \begin{figure}
+%   \centering
+%     \includegraphics[angle=90,height=0.9\textheight]{newrich_patchpanel.pdf}
+%   \caption[newrich_patchpanel]{The Trigger output patchpanel for the new RICH}
+%   \label{fig:richsector}
+% \end{figure}

diff --git a/trigger.tex b/trigger.tex
index 67fb07da84d4edc4bae2238b2d0c5edddb3df5c5..ead432c9c47ff6c80482793ac993aa7d27f777a8 100644 (file)
--- a/trigger.tex
+++ b/trigger.tex
@@ -3,21 +3,24 @@ Additionally there are 16 LVDS lines on one pin-header.
 
 Trigger cables to TOF and MDC3/4 as well as RPC, Shower and Forward Wall are transported using one 34 pin flat cable from the CTS to the front right (approx. 60 ns delay) resp. the rear right corner (83 ns) of the mainframe. From the front right corner there are two twisted pair wires going to each TOF sector, one pair used for TOF trigger, the other for MDC common stop.
 
-From the rear right corner there is a 20m Cat6 Ethernet cable (delay 105 ns) going to each sector of Shower and RPC plus two pais of twisted pair cable (80 ns delay) to Forward Wall. Veto and MDC1/2 are using twisted pair cables directly from the CTS using LVDS. RICH has a Cat7 Ethernet cables with all four wire pairs connecting CTS and RICH. 
-
-The delay of standard Ethernet cables has been measured to be 5.17 ns/m. The full setup is shown in figures \ref{trigger_cables} and \ref{trigger_to_cts}.
-
 The inputs to the central base line restorer boards are: First six inputs are the signals from all six TOF sectors, the other two lines on the first set of inputs are free. On the second half of inputs, port 1 to 5 and 7 are used for the six signals from RPC sectors.
 
-\begin{figure}
-  \centering
-  \includegraphics[width=.9\textheight,angle=90]{trigger_distribution.png}
-  \caption{Trigger Cables between CTS and detectors. Black times are delay requirements, red times are measured latencies.}
-  \label{trigger_cables}
-\end{figure}
+% \begin{figure}
+%   \centering
+%   \includegraphics[width=.9\textheight,angle=90]{trigger_distribution.png}
+%   \caption{Trigger Cables between CTS and detectors. Black times are delay requirements, red times are measured latencies.}
+%   \label{trigger_cables}
+% \end{figure}
 \begin{figure}
   \centering
   \includegraphics[width=.9\textheight,angle=90]{trigger_to_cts.pdf}
   \caption{Trigger Cables between detectors and CTS.}
   \label{trigger_to_cts}
 \end{figure}
+
+\begin{figure}
+  \centering
+  \includegraphics[width=.95\textwidth]{TriggerCollectionConnections.pdf}
+  \caption{Central trigger collector 0x100}
+  \label{trigger_collector_inputs}
+\end{figure}