From 62a2e651f7f221f647b43722c3fb2ce6d9675055 Mon Sep 17 00:00:00 2001 From: lhdamiani Date: Tue, 13 Jul 2021 18:39:49 +0200 Subject: [PATCH] revert close_run to interrupt consistency. imagemeta with user_id --- jf-assembler/src/EigerAssembler.cpp | 2 ++ std-det-writer/src/main.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/jf-assembler/src/EigerAssembler.cpp b/jf-assembler/src/EigerAssembler.cpp index f42e685..afc4c0a 100644 --- a/jf-assembler/src/EigerAssembler.cpp +++ b/jf-assembler/src/EigerAssembler.cpp @@ -69,6 +69,8 @@ void EigerAssembler::assemble_image(const char* src_meta, image_meta->dtype = (bit_depth_ <= 8) ? 1 : bit_depth_ / 8; image_meta->encoding = 0; image_meta->source_id = 0; + image_meta->user_1 = 0; + image_meta->user_2 = 0; is_pulse_init = 1; #ifdef DEBUG_OUTPUT using namespace date; diff --git a/std-det-writer/src/main.cpp b/std-det-writer/src/main.cpp index 10dbdfe..3a43e2f 100644 --- a/std-det-writer/src/main.cpp +++ b/std-det-writer/src/main.cpp @@ -62,11 +62,18 @@ int main (int argc, char *argv[]) } const string output_file = document["output_file"].GetString(); - const uint64_t image_id = document["image_metadata"]["id"].GetUint64(); + const uint64_t image_id = document["image_id"].GetUint64(); const int run_id = document["run_id"].GetInt(); const int i_image = document["i_image"].GetInt(); const int n_images = document["n_images"].GetInt(); + // i_image == n_images -> end of run. + if (i_image == n_images) { + writer.close_run(); + stats.end_run(); + continue; + } + // i_image == 0 -> we have a new run. if (i_image == 0) { auto image_meta = (ImageMetadata*) @@ -97,12 +104,5 @@ int main (int argc, char *argv[]) writer.write_meta(run_id, i_image, image_meta); } - // i_image == n_images -> end of run. - if (i_image == n_images - 1) { - writer.close_run(); - stats.end_run(); - continue; - } - } }