FileWriter: Master HDF5 contains scalar per-image processing results, reader is also made to prioritize reading from master file

frame_serialize/CBORStream2Serializer.cpp

@@ -153,6 +153,23 @@ inline void CBOR_ENC(CborEncoder &encoder, const char* key, const std::vector<fl
     cborErr(cbor_encode_byte_string(&encoder, (uint8_t *) v.data(), v.size() * sizeof(float)));
 }
 
+inline void CBOR_ENC(CborEncoder &encoder, const char* key, const std::vector<uint8_t>& v) {
+    cborErr(cbor_encode_text_stringz(&encoder, key));
+    cborErr(cbor_encode_tag(&encoder, TagUnsignedInt8Bit));
+    cborErr(cbor_encode_byte_string(&encoder, v.data(), v.size() * sizeof(uint8_t)));
+}
+
+inline void CBOR_ENC(CborEncoder &encoder, const char* key, const std::vector<int32_t>& v) {
+    cborErr(cbor_encode_text_stringz(&encoder, key));
+    cborErr(cbor_encode_tag(&encoder, TagSignedInt32BitLE));
+    cborErr(cbor_encode_byte_string(&encoder, reinterpret_cast<const uint8_t *>(v.data()), v.size() * sizeof(int32_t)));
+}
+
+inline void CBOR_ENC(CborEncoder &encoder, const char* key, const std::vector<int64_t>& v) {
+    cborErr(cbor_encode_text_stringz(&encoder, key));
+    cborErr(cbor_encode_tag(&encoder, TagSignedInt64BitLE));
+    cborErr(cbor_encode_byte_string(&encoder, reinterpret_cast<const uint8_t *>(v.data()), v.size() * sizeof(int64_t)));
+}
 
 inline void CBOR_ENC(CborEncoder &encoder, const char* key, const std::vector<uint64_t>& v) {
     cborErr(cbor_encode_text_stringz(&encoder, key));
@@ -679,7 +696,27 @@ void CBORStream2Serializer::SerializeSequenceEnd(const EndMessage& message) {
     CBOR_ENC(mapEncoder, "rotation_lattice_type", message.rotation_lattice_type);
     if (message.rotation_lattice.has_value())
         CBOR_ENC(mapEncoder, "rotation_lattice", message.rotation_lattice->GetVector());
-    CBOR_ENC(mapEncoder, "image_scale_factor", message.scale_factor);
+
+    CBOR_ENC(mapEncoder, "data_collection_efficiency_image", message.data_collection_efficiency);
+    CBOR_ENC(mapEncoder, "spot_count", message.spot_count);
+    CBOR_ENC(mapEncoder, "spot_count_ice_ring", message.spot_count_ice_ring);
+    CBOR_ENC(mapEncoder, "spot_count_low_res", message.spot_count_low_res);
+    CBOR_ENC(mapEncoder, "spot_count_indexed", message.spot_count_indexed);
+    CBOR_ENC(mapEncoder, "image_indexed", message.image_indexed);
+    CBOR_ENC(mapEncoder, "v_bkg_estimate", message.v_bkg_estimate);
+    CBOR_ENC(mapEncoder, "profile_radius", message.profile_radius);
+    CBOR_ENC(mapEncoder, "mosaicity", message.mosaicity);
+    CBOR_ENC(mapEncoder, "bFactor", message.bFactor);
+    CBOR_ENC(mapEncoder, "resolution_estimate", message.resolution_estimate);
+    CBOR_ENC(mapEncoder, "min_viable_pixel_value", message.min_viable_pixel_value);
+    CBOR_ENC(mapEncoder, "max_viable_pixel_value", message.max_viable_pixel_value);
+    CBOR_ENC(mapEncoder, "saturated_pixel_count", message.saturated_pixel_count);
+    CBOR_ENC(mapEncoder, "error_pixel_count", message.error_pixel_count);
+    CBOR_ENC(mapEncoder, "image_scale_factor", message.image_scale_factor);
+    CBOR_ENC(mapEncoder, "integrated_reflections", message.integrated_reflections);
+    CBOR_ENC(mapEncoder, "niggli_class", message.niggli_class);
+    CBOR_ENC(mapEncoder, "pixel_sum", message.pixel_sum);
+
     cborErr(cbor_encoder_close_container(&encoder, &mapEncoder));
 
     curr_size = cbor_encoder_get_buffer_size(&encoder, buffer);