Fix few syntax error and remove some outdated stuff.

diff --git a/evtbuild.tex b/evtbuild.tex
index f12699b5dcd7c33147fbbd2b36b52534d4d31c4e..49dfc99734fe3aea0ffbb3d1f2f28f76b91edd49 100644 (file)
--- a/evtbuild.tex
+++ b/evtbuild.tex
@@ -1367,7 +1367,7 @@ In 2018, the HADES eventbuilding topology has bee changed for a DABC builder net
 
 \subsection{Go4 online monitoring for DABC with stream framework} 
 \label{go4:for:dabc}
-Several analysis codes for the analysis framework \href{http:go4.gsi.de}{Go4} exist that contain unpackers for the
+Several analysis codes for the analysis framework \href{http://go4.gsi.de}{Go4} exist that contain unpackers for the
 hadaq data format and specialized code for trb3 frontends. These are implemented by means of the {\em stream} framework as described in
 \href{https://subversion.gsi.de/go4/app/stream/Readme.md}{https://subversion.gsi.de/go4/app/stream/Readme.md}.
 
@@ -1379,7 +1379,8 @@ The code implemented in this framework may run in different environments:
 \end{itemize}
 
 At 
-\href{https://web-docs.gsi.de/~dabc/doc/dabc2/hadaq\_trb3\_package.html}{https://web-docs.gsi.de/\tilde{~}dabc/doc/dabc2/hadaq\_trb3\_package.html}.
+\href{https://web-docs.gsi.de/\~dabc/doc/dabc2/hadaq\_trb3\_package.html}
+{https://web-docs.gsi.de/\~dabc/doc/dabc2/hadaq\_trb3\_package.html}.
 a further description can be found.
 The subversion repository \href{https://subversion.gsi.de/dabc/trb3/}{https://subversion.gsi.de/dabc/trb3/}
 contains all ROOT, Go4 and DABC software packages that are required for running a standalone DAQ system with online monitoring analysis.

diff --git a/installation_trbnet.tex b/installation_trbnet.tex
index 8c60fcafec42cf5dcecc54c11a398cefebce814f..a330871acb7853522f2453b67e4289e3e0194f08 100644 (file)
--- a/installation_trbnet.tex
+++ b/installation_trbnet.tex
@@ -1,4 +1,4 @@
-\subsection{TrbNet Hub}
+\subsection{TrbNet Hub (TRB2)}
 The first FPGA handles ports 1 to 16, the second FPGA is connected to ports 17 to 20. The assignment of hardware (physical) ports to internal (logical) port numbers can be found below. The logical port number 0 is always the main up-link of the FPGA.
 \begin{description}
  \item[Port 1 -- 4] These ports are not used
@@ -13,99 +13,99 @@ The first FPGA handles ports 1 to 16, the second FPGA is connected to ports 17 t
 
 The internal endpoint used to control and monitor the hub is always connected to the next logical port number above the physically available ports. I.e. in FPGA 1 it is connected to logical port 13, on FPGA2 to logical port 4.
 
-The usage of physical ports 5 -- 16 on TrbNet Hubs is given in the following lists
-
-\begin{table}
-\begin{center}
-\begin{tabularx}{\textwidth}{|c|c|X|}
-\hline
-\textbf{Physical Port} & \textbf{Logical Port} & \textbf{Subsystem} \\
-\hline
-\hline
--  & 0  & Uplink to second FPGA \\
-5  & 1  & RPC sectors 1,2,3     \\
-6  & 2  & RPC sectors 4,5,6     \\
-7  & 3  & MDC planes 1,2        \\
-8  & 4  & MDC planes 3,4        \\
-9  & 5  & Forward Wall          \\
-10 & 6  & TOF                   \\
-11 & 7  & Shower                \\
-12 & 8  & RICH sectors 1,2      \\
-13 & 9  & RICH sectors 3,4      \\
-14 & 10 & RICH sectors 5,6      \\
-15 & 11 & Start/Veto/CTS        \\
-\hline
-\end{tabularx}
-\caption{Port usage on central TrbNet hub}
-\label{centralhubports}
-\end{center}
-\end{table}
-
-% -- connect CTS to SFP1 (TRB3 sends slow-control to CTS)
-% -- connect Slow-Control Master to SFP2 (TRB3 sends no triggers here)
-% -- use SFP3/4 as normal downlink (no GbE, hence subevent data is discarded!) 
-
-\begin{table}
-\begin{center}
-\begin{tabularx}{\textwidth}{|c|c|X|}
-\hline
-\textbf{FPGA} & \textbf{Port} & \textbf{Subsystem} \\
-\hline
-\hline
-0  & 1 / 4  & CTS. Receives triggers and sends slow-control\\
-0  & 2 / 5  & Slow-control/Pexor. Uplink only.\\
-0  & 3 / 6  & MDC planes 1,2\\
-0  & 4 / 7  & MDC planes 3,4\\
-
-1  & 1 & RPC sectors 1,2 \\
-1  & 2 & RPC sectors 3,4 \\
-1  & 3 & RPC sectors 5,6 \\
-1  & 4 & RICH sectors 5,6\\
-1  & 5 & RICH sectors 3,4\\
-1  & 6 & RICH sectors 1,2  \\
-
-2  & 1 & TOF\\
-2  & 2 & Start/Veto/CTS\\
-2  & 3 & Forward Wall\\
-2  & 4 & \\
-2  & 5 & \\
-2  & 6 & \\
-
-
-3  & 1 & Pion Tracker 1\\
-3  & 2 & Pion Tracker 2\\
-3  & 3 & Start TRB3\\
-3  & 4 & Veto TRB3\\
-3  & 5 & \\
-3  & 6 & \\
-
-4  & 1 & Shower 1 \\
-4  & 2 & Shower 2 \\
-4  & 3 & Shower 3 \\
-4  & 4 & Shower 4 \\
-4  & 5 & Shower 5 \\
-4  & 6 & Shower 6 \\
-\hline
-\end{tabularx}
-\caption{Port usage on central TrbNet hub, after replacement with a TRB3 based hub}
-\label{centralnewhubports}
-\end{center}
-\end{table}
- 
-\begin{description}
- \item[Central Hub (0x8001)] The central hub connects all subsystems together. Table \ref{centralhubports} shows the physical and logical port numbers and the subsystems connected to them.
- \item[MDC Hub plane 1,2 (0x8101)] The hub connecting the six MDC Hubs for MDC planes 1 and 2. Logical ports 1 to 6 are used for sectors 1 to 6 (naturally in the same order)
- \item[MDC Hub plane 3,4 (0x8111)] The hub connecting the six MDC Hubs for MDC planes 3 and 4. Logical ports 1 to 6 are used for sectors 1 to 6 (naturally in the same order)
- \item[RICH Hub sector 1,2 (0x8301)] Port 1 to 5 connect to the ADCM in sector 1, port 6 to 10 connect to the boards in sector 2.
- \item[RICH Hub sector 3,4 (0x8311)] Port 1 to 5 connect to the ADCM in sector 3, port 6 to 10 connect to the boards in sector 4.
- \item[RICH Hub sector 3,4 (0x8321)] Port 1 to 5 connect to the ADCM in sector 5, port 6 to 10 connect to the boards in sector 6.
- \item[RPC Hub Sector 1,2,3 (0x8401)] This hub connects all 12 TRB of the first three sectors. Sector 1 is connected to logical ports 1 to 4, sector 2 on ports 5 to 8, sector 3 on ports 9 to 12. The TRB in each sector are numbered from 0 to 3, the ports are connected in the same order.
- \item[RPC Hub Sector 4,5,6 (0x8411)] This hub connects all 12 TRB of the last three sectors. Sector 4 is connected to logical ports 1 to 4, sector 5 on ports 5 to 8, sector 6 on ports 9 to 12. The TRB in each sector are numbered from 0 to 3, the ports are connected in the same order.
- \item[Shower Hub (0x8501)] Port 1 to 6 connect to the Shower AddOn in each of the sectors.
- \item[TOF Hub (0x8601)] Port 1 to 6 connect to the TRBs in each of the sectors, Port 7 is used for the additional TRB.
- \item[Forward Wall (0x8701)] This hub connects the three TRB of Forward Wall. Ports 1 to 3 are used, connected in the same order as the TRB are numbered.
- \item[Start/Veto/CTS Hub (0x8801)] Port 1 connects to the Start-TRB, Port 2 to the Veto TRB, Port 3 to the readout port of  the CTS.
-\end{description}
+% The usage of physical ports 5 -- 16 on TrbNet Hubs is given in the following lists
+% 
+% \begin{table}
+% \begin{center}
+% \begin{tabularx}{\textwidth}{|c|c|X|}
+% \hline
+% \textbf{Physical Port} & \textbf{Logical Port} & \textbf{Subsystem} \\
+% \hline
+% \hline
+% -  & 0  & Uplink to second FPGA \\
+% 5  & 1  & RPC sectors 1,2,3     \\
+% 6  & 2  & RPC sectors 4,5,6     \\
+% 7  & 3  & MDC planes 1,2        \\
+% 8  & 4  & MDC planes 3,4        \\
+% 9  & 5  & Forward Wall          \\
+% 10 & 6  & TOF                   \\
+% 11 & 7  & Shower                \\
+% 12 & 8  & RICH sectors 1,2      \\
+% 13 & 9  & RICH sectors 3,4      \\
+% 14 & 10 & RICH sectors 5,6      \\
+% 15 & 11 & Start/Veto/CTS        \\
+% \hline
+% \end{tabularx}
+% \caption{Port usage on central TrbNet hub}
+% \label{centralhubports}
+% \end{center}
+% \end{table}
+% 
+% % -- connect CTS to SFP1 (TRB3 sends slow-control to CTS)
+% % -- connect Slow-Control Master to SFP2 (TRB3 sends no triggers here)
+% % -- use SFP3/4 as normal downlink (no GbE, hence subevent data is discarded!) 
+% 
+% \begin{table}
+% \begin{center}
+% \begin{tabularx}{\textwidth}{|c|c|X|}
+% \hline
+% \textbf{FPGA} & \textbf{Port} & \textbf{Subsystem} \\
+% \hline
+% \hline
+% 0  & 1 / 4  & CTS. Receives triggers and sends slow-control\\
+% 0  & 2 / 5  & Slow-control/Pexor. Uplink only.\\
+% 0  & 3 / 6  & MDC planes 1,2\\
+% 0  & 4 / 7  & MDC planes 3,4\\
+% 
+% 1  & 1 & RPC sectors 1,2 \\
+% 1  & 2 & RPC sectors 3,4 \\
+% 1  & 3 & RPC sectors 5,6 \\
+% 1  & 4 & RICH sectors 5,6\\
+% 1  & 5 & RICH sectors 3,4\\
+% 1  & 6 & RICH sectors 1,2  \\
+% 
+% 2  & 1 & TOF\\
+% 2  & 2 & Start/Veto/CTS\\
+% 2  & 3 & Forward Wall\\
+% 2  & 4 & \\
+% 2  & 5 & \\
+% 2  & 6 & \\
+% 
+% 
+% 3  & 1 & Pion Tracker 1\\
+% 3  & 2 & Pion Tracker 2\\
+% 3  & 3 & Start TRB3\\
+% 3  & 4 & Veto TRB3\\
+% 3  & 5 & \\
+% 3  & 6 & \\
+% 
+% 4  & 1 & Shower 1 \\
+% 4  & 2 & Shower 2 \\
+% 4  & 3 & Shower 3 \\
+% 4  & 4 & Shower 4 \\
+% 4  & 5 & Shower 5 \\
+% 4  & 6 & Shower 6 \\
+% \hline
+% \end{tabularx}
+% \caption{Port usage on central TrbNet hub, after replacement with a TRB3 based hub}
+% \label{centralnewhubports}
+% \end{center}
+% \end{table}
+%  
+% \begin{description}
+%  \item[Central Hub (0x8001)] The central hub connects all subsystems together. Table \ref{centralhubports} shows the physical and logical port numbers and the subsystems connected to them.
+%  \item[MDC Hub plane 1,2 (0x8101)] The hub connecting the six MDC Hubs for MDC planes 1 and 2. Logical ports 1 to 6 are used for sectors 1 to 6 (naturally in the same order)
+%  \item[MDC Hub plane 3,4 (0x8111)] The hub connecting the six MDC Hubs for MDC planes 3 and 4. Logical ports 1 to 6 are used for sectors 1 to 6 (naturally in the same order)
+%  \item[RICH Hub sector 1,2 (0x8301)] Port 1 to 5 connect to the ADCM in sector 1, port 6 to 10 connect to the boards in sector 2.
+%  \item[RICH Hub sector 3,4 (0x8311)] Port 1 to 5 connect to the ADCM in sector 3, port 6 to 10 connect to the boards in sector 4.
+%  \item[RICH Hub sector 3,4 (0x8321)] Port 1 to 5 connect to the ADCM in sector 5, port 6 to 10 connect to the boards in sector 6.
+%  \item[RPC Hub Sector 1,2,3 (0x8401)] This hub connects all 12 TRB of the first three sectors. Sector 1 is connected to logical ports 1 to 4, sector 2 on ports 5 to 8, sector 3 on ports 9 to 12. The TRB in each sector are numbered from 0 to 3, the ports are connected in the same order.
+%  \item[RPC Hub Sector 4,5,6 (0x8411)] This hub connects all 12 TRB of the last three sectors. Sector 4 is connected to logical ports 1 to 4, sector 5 on ports 5 to 8, sector 6 on ports 9 to 12. The TRB in each sector are numbered from 0 to 3, the ports are connected in the same order.
+%  \item[Shower Hub (0x8501)] Port 1 to 6 connect to the Shower AddOn in each of the sectors.
+%  \item[TOF Hub (0x8601)] Port 1 to 6 connect to the TRBs in each of the sectors, Port 7 is used for the additional TRB.
+%  \item[Forward Wall (0x8701)] This hub connects the three TRB of Forward Wall. Ports 1 to 3 are used, connected in the same order as the TRB are numbered.
+%  \item[Start/Veto/CTS Hub (0x8801)] Port 1 connects to the Start-TRB, Port 2 to the Veto TRB, Port 3 to the readout port of  the CTS.
+% \end{description}
 
 \subsection{MDC Hub}
 The MDC Hub has 5 FPGAs: FPGA 1 serves the first 8 FOT, FPGA 2 the second 8 FOT, FPGA 3 controls FOT 17 to 24, FPGA 4 FOT 25 to 32. The fifth FPGA controls the Uplink (logical port 0) and connects to the other 4 FPGAs (FPGA1: port 1 -- FPGA4: port 4).

diff --git a/main.tex b/main.tex
index a4592e5c27eada1f273363690f44d555caccb107..d221db649eb784ab9940f7cccf5c1c33582d0e14 100755 (executable)
--- a/main.tex
+++ b/main.tex
@@ -97,9 +97,9 @@
 \section{Network Addresses}
        \input{networkaddresses}
 
-\clearpage
-\section{Event Builder Setup}
-       \input{ebsetup}
+% \clearpage
+% \section{Event Builder Setup}
+%      \input{ebsetup}
 
 \clearpage
 \part{Endpoints}
@@ -128,8 +128,8 @@
 
 \clearpage
 \part{Detectors and Subsystems}
-\section{Shower}
-       \input{showerdata}
+% \section{Shower}
+%      \input{showerdata}
 
 \clearpage
 \section{MDC}
@@ -140,7 +140,7 @@
        \input{newrich}
 
 \clearpage
-\section{TOF / RPC / Forward Wall / Start-Veto}
+\section{TOF / RPC / Forward Wall}
        \input{tof}
 
 \clearpage
@@ -171,8 +171,8 @@
 \part{Cables \& Installation}
        \section{TrbNet Hubs Port Map}
        \input{installation_trbnet}
-       \section{Ethernet Switches Port Map}
-       \input{installation_ethernet}
+%      \section{Ethernet Switches Port Map}
+%      \input{installation_ethernet}
        \section{Trigger Distribution}
        \input{trigger}
 \clearpage
@@ -191,7 +191,7 @@
 \input{loggermessages}
 \input{generaldaq}
 \input{mdcinstructions}
-\input{showerinstructions}
+% \input{showerinstructions}
 \input{richinstructions}
 \input{blrconfig}
 \input{epics}

diff --git a/shortguide.tex b/shortguide.tex
index b18d0e72ef49db6052204dc0f7e2122e7dea1054..9d0cfe0454b00c60e462fe8f82fd305ce3b2f7c6 100644 (file)
--- a/shortguide.tex
+++ b/shortguide.tex
@@ -51,7 +51,7 @@ describes the use of these buttons.
   or using the BNET web gui controls (section \ref{sec:ebmonguide:dabc})}
   \item[Restart BNET $n$ builder(s)] Starts the EB with $n$ BNET builder node(s). This number of builder processes $n$ will be kept at subsequent calls of {\em Restart EB}.
   {\bf note: afterwards file writing must be explicitely switched on again with one of the {\em PrefixXX} buttons,
-  or using the BNET web gui controls (section \ref{sec:ebmonguide:dabc})    
+  or using the BNET web gui controls (section \ref{sec:ebmonguide:dabc})}    
   \item[Prefix XX] Start writing a new file with the prefix XX. BNET processes are not restarted by these buttons.
   
   

diff --git a/trb3/Trb3GeneralRemarks.tex b/trb3/Trb3GeneralRemarks.tex
index d081b32cd226bd56a29d148d01b3c1682b577e03..ac4686314323d1d4d42cc0a646497d3219146a0b 100644 (file)
--- a/trb3/Trb3GeneralRemarks.tex
+++ b/trb3/Trb3GeneralRemarks.tex
@@ -209,6 +209,7 @@ All boards of a given type are accessible by a broadcast address at the same tim
  \item 0x66 Trb3sc Hub no Backplane, w/ GbE 
  \item 0x67 Trb3sc Hub w/ Backplane, w/ GbE 
  \item 0x68 Trb3sc ADC AddOn
+ \item 0x69 Trb3sc for trigger gen. \& monitoring
  \item 0x70 Trb3sc TDC 4conn SFP
  \item 0x71 Trb3sc TDC 4conn Backplane
  \item 0x72 Trb3sc TDC KEL SFP