diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c7972..07b6e21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/core-buffer/include/formats.hpp b/core-buffer/include/formats.hpp index ffc065e..d8de5aa 100644 --- a/core-buffer/include/formats.hpp +++ b/core-buffer/include/formats.hpp @@ -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 diff --git a/jf-assembler/src/main.cpp b/jf-assembler/src/main.cpp index 870f951..9ccf79d 100644 --- a/jf-assembler/src/main.cpp +++ b/jf-assembler/src/main.cpp @@ -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);