From: Maps Date: Wed, 1 Jul 2015 17:05:06 +0000 (+0200) Subject: Updated Version 3 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=7e989d8bfc8672d7b3262a8d5aec24fe4feee669;p=mvd_docu.git Updated Version 3 --- diff --git a/dataformat/DataFileStructure.tex b/dataformat/DataFileStructure.tex index 1d4aa1b..a7657de 100644 --- 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 52bf6de..5664d00 100644 Binary files a/dataformat/main.pdf and b/dataformat/main.pdf differ