From: Maps <maps@ikf> Date: Tue, 17 Mar 2015 07:20:30 +0000 (+0100) Subject: Header - Data Version 3 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=261bc2e8e5ca1d8e72a7ccbb50b045f068797a25;p=mvd_docu.git Header - Data Version 3 --- diff --git a/dataformat/DataFileStructure.tex b/dataformat/DataFileStructure.tex index 5f2cb7f..1d4aa1b 100644 --- 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 1f18dc2..52bf6de 100644 Binary files a/dataformat/main.pdf and b/dataformat/main.pdf differ diff --git a/dataformat/main.tex b/dataformat/main.tex index 6cce3f3..2de1bf2 100644 --- 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}}