sf-daq/sf_daq_buffer
0
0
Fork 0
mirror of https://github.com/paulscherrerinstitute/sf_daq_buffer.git synced 2026-04-29 09:12:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed MODULE_N_BYTES requirement

Browse Source
This commit is contained in:
babic_a
2021-07-02 14:17:38 +02:00
parent 95be6b25e2
commit ce93dce7cf
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -32,10 +32,10 @@ add_subdirectory(
add_subdirectory("core-buffer")
add_subdirectory("jf-udp-recv")
add_subdirectory("jf-buffer-writer")
#add_subdirectory("jf-buffer-writer")
add_subdirectory("jf-assembler")
add_subdirectory("sf-stream")
add_subdirectory("sf-writer")
#add_subdirectory("sf-writer")
if(BUILD_JF_LIVE_WRITER)
add_subdirectory("jf-live-writer")
core-buffer/include/formats.hpp
+16 -16
View File
@@ -40,22 +40,22 @@ 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 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)
//#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
jf-assembler/src/main.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ int main (int argc, char *argv[])
EigerAssembler assembler(config.n_submodules, bit_depth);
RamBuffer frame_buffer(config.detector_name,
sizeof(ModuleFrame), MODULE_N_BYTES, config.n_modules);
sizeof(ModuleFrame), MODULE_N_PIXELS * bit_depth, config.n_modules);
RamBuffer image_buffer(config.detector_name + "_" + stream_name,
sizeof(ImageMetadata), assembler.get_image_n_bytes(), 1);