Header - Data Version 3

diff --git a/dataformat/DataFileStructure.tex b/dataformat/DataFileStructure.tex
index 5f2cb7f7e8eb21ca3ad7c2be32fdcabcad0d6979..1d4aa1bdca56e8c624502c34ce9a685b2de012a3 100644 (file)
--- a/dataformat/DataFileStructure.tex
+++ b/dataformat/DataFileStructure.tex
@@ -98,6 +98,27 @@ The first word must be equal for all data formats, containing sensor id and tota
 \end{table}
 
 
+\begin{table}[htbp]
+\begin{center}
+\begin{tabularx}{\textwidth}{|c|c|C|}
+\hline
+\textbf{Word} & \textbf{Bits} & \textbf{Description} \\
+\hline\hline
+1 Header & 15 -- 0  & Sensor ID \\
+         & 31 -- 16 & Frame Length (incl.\ the sensor Header and excl.\ the custom Header) \\
+2 Status & 15 -- 0  & 15 Bit status word (as provided by the data checker) \\
+         & 31 -- 16 & Free \\
+3 Time   & 31 -- 0  & 32 Bit Timestamp (when the frame has been received by the FPGA) \\
+4 External & 31 -- 0  & External Info (set by the slow control) \\
+5 -- N   & & Sensor Data \\
+\hline
+\end{tabularx}
+\caption{Frame format for the upgraded data (type 0x03). This is just a preliminary version and should possibly not be used anywhere.}
+\label{frameUpgradeData}
+\end{center}
+\end{table}
+
+
 \begin{table}[htbp]
 \begin{center}
 \begin{tabularx}{\textwidth}{|c|c|C|}

diff --git a/dataformat/main.pdf b/dataformat/main.pdf
index 1f18dc20617bba8ffb8446e0fa713a7f97f7ebe2..52bf6deee8c511346c9236822e583152450178cf 100644 (file)
Binary files a/dataformat/main.pdf and b/dataformat/main.pdf differ

diff --git a/dataformat/main.tex b/dataformat/main.tex
index 6cce3f3e96b91047c897b0c840846950167b586a..2de1bf2e25e794821bbfa29178ef9cf159c55a7e 100644 (file)
--- a/dataformat/main.tex
+++ b/dataformat/main.tex
@@ -70,7 +70,7 @@
 
 \title{MAPS Read-out Data Formats}
 \date{\today ~-~\thistime}
-\author{Jan Michel}
+\author{Jan Michel, Borislav Milanovi\'{c}}
 
 
 \newcommand{\files}[1]{\texttt{#1}}