From bc6e9d80ac5fbdfd93bdaef77d019348613461d7 Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Thu, 15 Nov 2018 11:05:16 +0100 Subject: [PATCH] Adjust cSAXS file format --- csaxs/CsaxsFormat.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/csaxs/CsaxsFormat.cpp b/csaxs/CsaxsFormat.cpp index 5cb66e8..2ac7528 100644 --- a/csaxs/CsaxsFormat.cpp +++ b/csaxs/CsaxsFormat.cpp @@ -26,16 +26,23 @@ class CsaxsFormat : public H5Format // After format has been writen, where to move the raw datasets. dataset_move_mapping.reset(new std::unordered_map( { - {config::raw_image_dataset_name, "data/" + dataset_name + "/data"}, + {config::raw_image_dataset_name, "detector/" + dataset_name}, + {"frame", "detector/" + "/frame"}, + {"is_good_frame", "detector/" + "/is_good_frame"}, + {"missing_packets_1", "detector/" + "/missing_packets_1"}, + {"missing_packets_2", "detector/" + "/missing_packets_2"}, + {"daq_recs", "detector/" + "/daq_recs"}, + {"daq_rec", "detector/" + "/daq_rec"}, + {"framenum_diff", "detector/" + "/framenum_diff"}, + {"framenums", "detector/" + "/framenums"}, + {"module_number", "detector/" + "/module_number"}, })); // Definition of the file format. file_format.reset( new h5_parent("", EMPTY_ROOT, { - s_ptr(new h5_group("data", { - s_ptr(new h5_group(dataset_name, {})) - })) + s_ptr(new h5_group("detector", {})) })); }