update addresses, add Ecal crates, remove some old stuff

diff --git a/boardposition_ecal.png b/boardposition_ecal.png
new file mode 100644 (file)
index 0000000..15b5f31
Binary files /dev/null and b/boardposition_ecal.png differ

diff --git a/ecal.tex b/ecal.tex
new file mode 100644 (file)
index 0000000..6786595
--- /dev/null
+++ b/ecal.tex
@@ -0,0 +1,9 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsection{Board Position}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{figure}
+  \centering
+  \includegraphics[width=.9\textwidth]{boardposition_ecal.png}
+  \caption{Position and Address of Boards in ECal crates}
+  \label{ecalcrates}
+\end{figure}

diff --git a/installation_ethernet.tex b/installation_ethernet.tex
index 355af5d5e3078eb62dda8b6b162127ae1bd6ad24..79e7031d233f5ceb603f20c7af52cfc3a4c729c9 100644 (file)
--- a/installation_ethernet.tex
+++ b/installation_ethernet.tex
@@ -1,4 +1,4 @@
-\begin{center}
-  \LTXtable{\textwidth}{installation_ethernet_table}
-\end{center}
+% \begin{center}
+%   \LTXtable{\textwidth}{installation_ethernet_table}
+% \end{center}
 

diff --git a/loggermessages.tex b/loggermessages.tex
index 4b78d69e7ee972844d6697eca794054e69c8783a..87bff23710a55069cab43b6f9e292252058398be 100644 (file)
--- a/loggermessages.tex
+++ b/loggermessages.tex
@@ -1,18 +1,18 @@
 \section{Messages in Logger Window}
-\subsection{Eventbuilder}
-\paragraph*{NETMEM-? <E> netmem.c, 685: ShmTrans\_open: failed to open shmem segment...}~\\
-There is a problem with shared memories between netmem and eventbuilder. See~\ref{sec:instructionseb}.
-
-\paragraph*{NETMEM-? <E> queue fill level exceeded 95\%}~\\
-A data buffer is full. Restart EB. If problem still exists: one data source is missing (Check with scan\_ports.pl)
-
-\paragraph*{EVTBLD-? <W> discarded events: 12}~\\
-The eventbuilder discarded some events. If rate is low (< 10 per second): ignore. Otherwise: Check if server is
-busy with some other task or restart EB.
-
-\paragraph*{daq\_netmem<W>[N]: UDP receive buffer length smaller than requested buffer length}~\\
-The system sets a maximum fo UDP buffer sizes lower than our usual sizes. This should be corrected automatically by default.
-Run \\\verb!sysctl -w net.core.rmem_max=10485760! and restart eventbuilders.
+% \subsection{Eventbuilder}
+% \paragraph*{NETMEM-? <E> netmem.c, 685: ShmTrans\_open: failed to open shmem segment...}~\\
+% There is a problem with shared memories between netmem and eventbuilder. See~\ref{sec:instructionseb}.
+% 
+% \paragraph*{NETMEM-? <E> queue fill level exceeded 95\%}~\\
+% A data buffer is full. Restart EB. If problem still exists: one data source is missing (Check with scan\_ports.pl)
+% 
+% \paragraph*{EVTBLD-? <W> discarded events: 12}~\\
+% The eventbuilder discarded some events. If rate is low (< 10 per second): ignore. Otherwise: Check if server is
+% busy with some other task or restart EB.
+% 
+% \paragraph*{daq\_netmem<W>[N]: UDP receive buffer length smaller than requested buffer length}~\\
+% The system sets a maximum fo UDP buffer sizes lower than our usual sizes. This should be corrected automatically by default.
+% Run \\\verb!sysctl -w net.core.rmem_max=10485760! and restart eventbuilders.
 
 \subsection{StatWatch}
 logerrors.pl is started within the daq start-up script. It should not give messages during DAQ start-up and shortly after.

diff --git a/main.tex b/main.tex
index 332c8767ef6b826be9b49c290d86ca2acad5908e..a4592e5c27eada1f273363690f44d555caccb107 100755 (executable)
--- a/main.tex
+++ b/main.tex
@@ -1,4 +1,4 @@
-\documentclass[11pt,a4paper,twoside]{scrartcl} %twoside
+\documentclass[11pt,a4paper,twoside,enabledeprecatedfontcommands]{scrartcl} %twoside
 
 %Einstellungen der Seitenr?nder
 \usepackage[left=3.5cm,right=3cm,top=2.5cm,bottom=2.5cm,includeheadfoot]{geometry}
@@ -137,12 +137,16 @@
 
 \clearpage
 \section{RICH}
-       \input{rich}
+       \input{newrich}
 
 \clearpage
 \section{TOF / RPC / Forward Wall / Start-Veto}
        \input{tof}
 
+\clearpage
+\section{ECal}
+       \input{ecal}
+       
 \clearpage
 \section{CTS}
        \input{cts}

diff --git a/networkaddresses.tex b/networkaddresses.tex
index 56aaf66892826c12d20f39d90a935a78735d1108..6a8b17a1f1d577bb54c091d17f2988e4121b0d62 100755 (executable)
--- a/networkaddresses.tex
+++ b/networkaddresses.tex
@@ -96,7 +96,8 @@ Forw. Wall & 4400 - 47FF & 3(*)  & last digit is the segment of FW \\
 RPC        & 4800 - 4BFF & 24(*) & 3rd digit is the sector, last digit normal(0) or additional(1) TRB \\
 TOF        & 4C00 - 4FFF & 9(*)  & 3rd digit is normal(0) or additional(1) TRB, last digit is the sector \\
 MDC        & 8100 - 81FF & 2(*)  & MDC readout via Hub \\
-RICH       & 8300 - 83FF & 3  & last digit is the sector divided by 2 \\
+RICH (old) & 8300 - 837F & 3  & last digit is the sector divided by 2 \\
+RICH (new) & 83C0 - 83CF & 13  &  RICH hubs\\
 RPC        & 8400 - 84FF & 2  & RPC readout via GbE \\
 Shower     & 8500 - 85FF & 1(*) & Shower readout via Hub \\
 TOF        & 8600 - 86FF & 1  & TOF readout via GbE \\
@@ -105,7 +106,7 @@ Start/Veto & 8800 - 887F & 1 & Start / Veto and CTS \\
 StartTRB3  & 8880 - 88FF & 2 & additional TRB3 with TDC data (8880: Start-TRB3, 8890 Veto-TRB3, 
 88F0 Start-TRB3 for tests) \\
 Pion       & 8900 - 89FF & 2 & Pion Tracker. 3rd digit is the station \\
-Ecal       & 8A00 - 8AFF & <32 & Calorimeter. 3rd digit: sector, 4th digit read-out board (preliminary)\\
+Ecal       & 8A00 - 8A0F & 6 & Calorimeter.\\
 \end{tabularx}
 \caption{Reserved SubEvent IDs Ranges. Ranges marked with a (*) are not going to be used in the standard setup.}
 \label{subeventidtable}

diff --git a/newrich.tex b/newrich.tex
new file mode 100644 (file)
index 0000000..e69de29