sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-05-07 05:44:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust formats to latest standard

Browse Source
This commit is contained in:
babic_a
2021-07-05 14:45:09 +02:00
parent 82a334212f
commit 7b4b750914
1 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-buffer/include/formats.hpp
+3 -30
View File
@@ -3,25 +3,19 @@
#include "buffer_config.hpp"
#ifndef USE_EIGER
#include "jungfrau.hpp"
#else
#include "eiger.hpp"
#endif
#define IS_BOTTOM(n) ((n%2 != 0) ? -1 : 1)
#pragma pack(push)
#pragma pack(1)
struct ModuleFrame {
uint64_t id;
uint64_t pulse_id;
uint64_t frame_index;
uint64_t daq_rec;
uint64_t n_recv_packets;
uint64_t module_id;
uint16_t bit_depth;
uint16_t row;
uint16_t column;
uint16_t pos_y;
uint16_t pos_x;
};
#pragma pack(pop)
@@ -36,26 +30,5 @@ struct ImageMetadata {
};
#pragma pack(pop)
//struct ModuleFrameBuffer {
// ModuleFrame module[N_MODULES];
//};
//#pragma pack(push)
//#pragma pack(1)
//struct BufferBinaryFormat {
// const char FORMAT_MARKER = 0xBE;
// ModuleFrame meta;
// char data[MODULE_N_BYTES];
//};
//#pragma pack(pop)
//#pragma pack(push)
//#pragma pack(1)
//struct BufferBinaryBlock
//{
// BufferBinaryFormat frame[buffer_config::BUFFER_BLOCK_SIZE];
// uint64_t start_pulse_id;
//};
//#pragma pack(pop)
#endif //SF_DAQ_BUFFER_FORMATS_HPP