update Hades address list

diff --git a/networkaddresses.tex b/networkaddresses.tex
index ac7c394b3f830b10d15d3c178f3a6e937f13634b..60dfa3480fe4358544dc5f8f16bcaf03a6b6e041 100755 (executable)
--- a/networkaddresses.tex
+++ b/networkaddresses.tex
@@ -1,8 +1,8 @@
-The documentation of network addresses can be found in the wiki:
-\url{http://hades-wiki.gsi.de/cgi-bin/view/DaqSlowControl/NetworkAddresses}
+%The documentation of network addresses can be found in the wiki:
+%\url{http://hades-wiki.gsi.de/cgi-bin/view/DaqSlowControl/NetworkAddresses}
 
 \subsection{Addressing scheme}
-On boards with two or more FPGAs each FPGA gets its own address. The FPGA providing the uplink gets the lowest address (usually with 0 as 4th digit), the other FPGAs are numbered in the order they are placed on the board starting with 1 as the last digit.
+On boards with two or more FPGAs each FPGA gets its own address. The FPGA providing the uplink gets the lowest address (usually with 0 as 4th digit), the other FPGAs are numbered in the order they are placed on the board.
 
 
 
@@ -15,10 +15,11 @@ On boards with two or more FPGAs each FPGA gets its own address. The FPGA provid
 digit FPGA (0-4) \\
 2000 - 2FFF & MDC OEP & 2nd digit: MDC layer (0-3); 3rd digit: sector (0-5); 4th digit MBO (0-F) \\
 3800 - 38FF & Pion  & 3rd digit station, 4th digit side (x/y)\\
-5000 - 50FF & StartTRB3 & TRB3 for Start. 3rd digit: 0: Start, 1: Veto. 4th digit: FPGA (0-3)\\ 
+5000 - 50FF & StartTRB3 & Start/Veto/iTOF. 3rd digit: 0: Start, 1: Veto, 4th digit: FPGA (0-5)\\ 
 5555        & SEB & Dummy Address used in headers generated by SubEventBuilders \\
 5800 - 58FF & RPC & 3rd digit sector (0..5), 4th digit TDC (0..8) \\
 5C00 - 5CFF & TOF & 3rd digit sector (0..6), 4th digit TDC (0..3) \\ 
+5D00 - 5D0F & iTOF & 4th digit TDC (0..5) \\
 6000 - 60FF & Ecal & Ecal read-out. 3rd digit: Sector, 4th digit: Readout Board (0-6)\\
 6400 - 64FF & STT &  3rd digit board number (0-9), 4th digit FPGA (1-4) \\
 6800 - 68FF & f-RPC &  3rd digit board number (0-1), 4th digit FPGA (1-4)\\
@@ -28,12 +29,13 @@ digit FPGA (0-4) \\
 83C0 - 83DF & RICH Hubs & Hubs for old RICH, 4th digit: hub number (0..13)\\
 84C0 - 84CF & RPC Hubs & Hubs for RPC, 4th digit: sector (0..5) \\
 86C0 - 86CF & TOF Hub & Hubs (central FPGA TRB3), 4th digit: sector(0..6)\\
-8800 - 887F & Central Hub& Central Hubs with GbE  \\
-8880 - 88BF & Start Hub & Hubs for timing detectors, 8880: Start-TRB3, 8890 Veto-TRB3\\
+8800 - 88FF & Central Hub & Central Hubs with GbE  \\
+8880 - 88BF & Start Hub & Hubs for timing detectors, 8880: Start, 8890 Veto\\
 8900 - 89FF & Pion Tracker Hub & 3rd digit: station\\
 8A00 - 8AFF & Ecal Hubs& 4th digit: pseudo-sector\\
 8B00 - 8BFF & STT Hubs & 3rd digit board number (0-9)\\
 8C00 - 8CFF & f-RPC Hubs & 3rd digit board number (0-1)\\
+8D00 - 8D00 & iTOF & innerTOF \\
 F000 - FDFF & Test Setups & \\
 FE00 - FFFF & Broadcasts & Reserved for extension of broadcast addresses
 \end{tabularx}
@@ -69,9 +71,9 @@ FE00 - FFFF & Broadcasts & Reserved for extension of broadcast addresses
 \end{table}
 
 
-\subsection{Replacement Boards}
-\label{ReplacementAddresses}
-If a TRB gets replaced, it is vital to keep track of these changes in analysis. Therefore, the replacement board gets a different address than the original board. These replacement addresses are always similar to the normal ones plus additional bits set. For this purpose, bits 8, 9 and 12 of the address are reserved. This results in 8 reserved replacement addresses for each board.
+%\subsection{Replacement Boards}
+%\label{ReplacementAddresses}
+%If a TRB gets replaced, it is vital to keep track of these changes in analysis. Therefore, the replacement board gets a different address than the original board. These replacement addresses %are always similar to the normal ones plus additional bits set. For this purpose, bits 8, 9 and 12 of the address are reserved. This results in 8 reserved replacement addresses for each board.
 
 \subsection{Broadcasts}
 \label{BroadcastAddresses}
@@ -86,11 +88,11 @@ If the bitmask configuration of an endpoint contains two unset bits it will answ
 - & FFFF & All boards \\
 0 & FFFE & Hubs\\
 1 & FFFD & MDC OEPB \\
-2 & FFFB & RICH ADCM \\
-3 & FFF7 & Shower \\
-4 & FFEF & TOF TRB \\
-5 & FFDF & RPC TRB \\
-6 & FFBF &  \\
+%2 & FFFB & RICH ADCM \\
+%3 & FFF7 & Shower \\
+%4 & FFEF & TOF TRB \\
+%5 & FFDF & RPC TRB \\
+%6 & FFBF &  \\
 7 & FF7F & Ethernet Bridges \\
 \end{tabular}
 \caption{Broadcast Addresses}
@@ -103,22 +105,20 @@ If the bitmask configuration of an endpoint contains two unset bits it will answ
 \label{subeventids}
 The subevent ids are assigned based on the trbnet addresses of the board forming the subevent. The range in which TRBs are located is restricted due to demands of the unpacking software.
 
-In summary, the only boards that send subevents are the Hubs, MDC Concentrators and Shower AddOns as well as the CTS. This sums up to 30 individual SubEvents.
-
 \begin{table}[hb]
 \begin{center}
 \begin{tabularx}{\textwidth}{l|l|l|X}
 \textbf{System} & \textbf{ID} & \textbf{Number} & \textbf{Description} \\
 MDC        & 1000 - 17FF & 12 & second digit is inner(0) or outer(1) MDC, 3rd digit is the sector \\
-RICH       & 83C0 - 83CF & 13  &  RICH hubs\\
+RICH       & 83C0 - 83CF & 12  &  RICH hubs\\
 RPC        & 84C0 - 84FF & 6  & \\
-TOF        & 86C0 - 86FF & 7 & \\
-Start/Veto & 8800 - 887F & 1 & central Hub, e.g. CTS, trigger generation \\
-StartTRB3  & 8880 - 88FF & 2 & TRB3 with TDC data (8880: Start-TRB3, 8890 Veto-TRB3) \\
-Pion       & 8900 - 89FF & 2 & Pion Tracker. 3rd digit is the station \\
+TOF        & 86C0 - 86FF & 6 & \\
+CTS        & 8800 - 887F & 1 & central Hub, e.g. CTS, trigger generation \\
+Start      & 8880 - 88FF & 2 & 8880: Start, 8890: Veto \\
 Ecal       & 8A00 - 8A0F & 6 & Calorimeter\\
 FT         & 8B00 - 8BFF & 10 & Forward Tracker\\
 f-RPC      & 8C00 - 8CFF & 2 & Forward RPC\\
+iTOF       & 8D00 - 8DFF & 1 & inner TOF\\
 \hline
 \textbf{Outdated} & (2019) && \\
 \hline
@@ -133,9 +133,10 @@ RPC (old)  & 8400 - 84FF & 2  & RPC readout via GbE \\
 TOF (old)  & 8600 - 86FF & 1  & TOF readout via GbE \\
 Shower     & 8500 - 85FF & 1(*) & Shower readout via Hub \\
 Wall       & 8700 - 87FF & 1  & Forward Wall readout via GbE \\
+Pion       & 8900 - 89FF & 2 & Pion Tracker. 3rd digit is the station \\
 
 \end{tabularx}
-\caption{Reserved SubEvent IDs Ranges. Ranges marked with a (*) are not going to be used in the standard setup.}
+\caption{Reserved SubEvent IDs Ranges.}
 \label{subeventidtable}
 \end{center}
 \end{table}