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

eiger config json update. det writer image id bugfix

Browse Source
This commit is contained in:
lhdamiani
2021-07-08 18:27:05 +02:00
parent 1f00aed5c2
commit 2a6af029b7
7 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jf-assembler/src/EigerAssembler.cpp
+5 -3
View File
@@ -64,9 +64,11 @@ void EigerAssembler::assemble_image(const char* src_meta,
// init good image status = 0
image_meta->status = 0;
image_meta->id = frame_meta->id;
// todo fill rest of image metadata
// image_meta->height
// image_meta->width
image_meta->height = n_modules_ / 2 * MODULE_Y_SIZE + GAP_Y_MODULE_PIXELS;
image_meta->width = n_modules_ / 2 * MODULE_X_SIZE + GAP_X_MODULE_PIXELS;
image_meta->dtype = (bit_depth_ <= 8) ? 1 : bit_depth_ / 8;
image_meta->encoding = 0;
image_meta->source_id = 0;
is_pulse_init = 1;
}
jf-assembler/src/main.cpp
+2 -1
View File
@@ -45,6 +45,7 @@ int main (int argc, char *argv[])
const int bit_depth = atoi(argv[2]);
auto const stream_name = "assembler";
const size_t IMAGE_N_BYTES = config.image_n_pixels * bit_depth / 8;
auto ctx = zmq_ctx_new();
zmq_ctx_set(ctx, ZMQ_IO_THREADS, ASSEMBLER_ZMQ_IO_THREADS);
auto sender = BufferUtils::bind_socket(
@@ -82,7 +83,7 @@ int main (int argc, char *argv[])
RamBuffer image_buffer(config.detector_name + "_" + stream_name,
sizeof(ImageMetadata), assembler.get_image_n_bytes(), 1,
sizeof(ImageMetadata), IMAGE_N_BYTES, 1,
buffer_config::RAM_BUFFER_N_SLOTS);
AssemblerStats stats(config.detector_name, ASSEMBLER_STATS_MODULO);