Updated Version 3

diff --git a/dataformat/DataFileStructure.tex b/dataformat/DataFileStructure.tex
index 1d4aa1bdca56e8c624502c34ce9a685b2de012a3..a7657dea23d6327ec33d4a8c0490e0c328ae8043 100644 (file)
--- a/dataformat/DataFileStructure.tex
+++ b/dataformat/DataFileStructure.tex
@@ -105,12 +105,15 @@ The first word must be equal for all data formats, containing sensor id and tota
 \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) \\
+         & 31 -- 16 & Total Frame Length in 16-bit words \\
 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 \\
+5 Start  & 31 -- 0  & Sensor Header, should be 0x55555555 \\
+6 Frame  & 31 -- 0  & Frame Number \\
+7 Length & 15 -- 0  & Frame Length, copied in upper 16 Bit \\
+8 -- 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.}

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