added Pion tracker addresses and SubEvent Ids. Also added connections for new central Hub

diff --git a/installation_trbnet.tex b/installation_trbnet.tex
index ffa9933113f55dafcbf8534e58a8a86f008608a2..a58e585d6fd0a992add69f356d608127edb609a4 100644 (file)
--- a/installation_trbnet.tex
+++ b/installation_trbnet.tex
@@ -40,6 +40,57 @@ The usage of physical ports 5 -- 16 on TrbNet Hubs is given in the following lis
 \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 & Start/Veto/CTS \\
+1  & 2 & RICH sectors 5,6\\
+1  & 3 & RICH sectors 3,4\\
+1  & 4 & RICH sectors 1,2\\
+1  & 5 & TOF\\
+1  & 6 & Forward Wall\\
+
+2  & 1 & RPC sectors 1,2,3\\
+2  & 2 & RPC sectors 4,5,6\\
+2  & 3 & \\
+2  & 4 & \\
+2  & 5 & \\
+2  & 6 & \\
+
+3  & 1 & Shower 1 \\
+3  & 2 & Shower 2 \\
+3  & 3 & Shower 3 \\
+3  & 4 & Shower 4 \\
+3  & 5 & Shower 5 \\
+3  & 6 & Shower 6 \\
+
+4  & 1 & Pion Tracker 1\\
+4  & 2 & Pion Tracker 2\\
+4  & 3 & \\
+4  & 4 & \\
+4  & 5 & \\
+4  & 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.

diff --git a/networkaddresses.tex b/networkaddresses.tex
index 608a2efcc1841b6f6e987c9c72ddfce18292413b..e971868306a49b615d2b0cda3995f847284a5ba9 100755 (executable)
--- a/networkaddresses.tex
+++ b/networkaddresses.tex
@@ -11,12 +11,12 @@ On boards with two or more FPGAs each FPGA gets its own address. The FPGA provid
 \begin{tabularx}{\textwidth}{l|l|X}
 \textbf{Address(es)} & \textbf{Board(s)} & \textbf{Description} \\
 0000 - 00FF & CTS & \\
-0100 - 01FF & Slow Control & \\
-0200 - 02FF & Other CTS-like boards \\
-1000 - 17FF & MDC Concentrator & 2nd digit: inner(0) / outer(1) MDC; 3rd digit: sector (0-5), 4th digit FPGA (0-4) \\
+1000 - 17FF & MDC Concentrator & 2nd digit: inner(0) / outer(1) MDC; 3rd digit: sector (0-5), 4th
+digit FPGA (0-4) \\
 2000 - 2FFF & MDC OEP & 2nd digit: MDC layer (0-3); 3rd digit: sector (0-5); 4th digit MBO (0-F) \\
 3000 - 31FF & RICH ADCM & 3rd digit: sector (0-5); 4th digit: segment (0-4) \\
 3200 - 37FF & Shower AddOn & 3rd digit: sector (0-5); 4th digit: FPGA (0-2) \\
+3800 - 38FF & Pion  & 3rd digit station, 4th digit side (x/y)\\
 4000 - 400F & Start & Start detector \\
 4010 - 401F & Veto & Veto detector \\
 4400 - 47FF & Wall & 3 TRBs for forward wall \\
@@ -31,6 +31,7 @@ On boards with two or more FPGAs each FPGA gets its own address. The FPGA provid
 8600 - 86FF & TOF Hub & \\
 8700 - 87FF & Forward Wall Hub & \\
 8800 - 88FF & Start/Veto/CTS Hub & \\
+8900 - 89FF & Pion Tracker Hub & 3rd digit: station\\
 F000 - FDFF & Test Setups & \\
 FE00 - FEFF & Reserved & Reserved for extension of broadcast addresses \\
 FF00 - FFFF & Broadcasts &
@@ -94,6 +95,7 @@ Shower     & 8500 - 85FF & 1(*) & Shower readout via Hub \\
 TOF        & 8600 - 86FF & 1  & TOF readout via GbE \\
 Wall       & 8700 - 87FF & 1  & Forward Wall readout via GbE \\
 Start/Veto & 8800 - 88FF & 1 & Start / Veto  (and CTS in the final version) \\
+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.}
 \label{subeventidtable}