v1.0.0-rc.134 (#43)

This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.132.

* jfjoch_broker: Add better locking for detector object - should help, when detector initialization takes too long
* jfjoch_writer: Enable writing single, integrated HDF5 file with both data and metadata
* XDS plugin: Add generation of Jungfraujoch plugin for XDS
* CI: Add tests with XDS and DIALS (`xia2.ssx`)

Reviewed-on: #43

writer/HDF5DataFilePluginDetector.cpp

@@ -3,6 +3,10 @@
 
 #include "HDF5DataFilePluginDetector.h"
 
+HDF5DataFilePluginDetector::HDF5DataFilePluginDetector(const StartMessage &msg) {
+    integrated_format = (msg.file_format == FileWriterFormat::NXmxIntegrated);
+}
+
 void HDF5DataFilePluginDetector::OpenFile(HDF5File &in_data_file, const DataMessage &msg, size_t images_per_file) {
     jf_info.reserve(images_per_file);
     storage_cell.reserve(images_per_file);
@@ -42,22 +46,24 @@ void HDF5DataFilePluginDetector::Write(const DataMessage &msg, uint64_t image_nu
 }
 
 void HDF5DataFilePluginDetector::WriteFinal(HDF5File &data_file) {
-    if (!jf_info.empty())
-        data_file.SaveVector("/entry/detector/det_info", jf_info.vec());
-    if (!storage_cell.empty())
-        data_file.SaveVector("/entry/detector/storage_cell_image", storage_cell.vec());
-    if (!receiver_aq_dev_delay.empty())
-        data_file.SaveVector("/entry/detector/rcv_delay", receiver_aq_dev_delay.vec());
-    if (!receiver_free_buffers.empty())
-        data_file.SaveVector("/entry/detector/rcv_free_send_buffers", receiver_free_buffers.vec());
-    if (!packets_received.empty())
-        data_file.SaveVector("/entry/detector/packets_received", packets_received.vec());
-    if (!packets_expected.empty())
-        data_file.SaveVector("/entry/detector/packets_expected", packets_expected.vec());
-    if (!pixel_sum.empty())
-        data_file.SaveVector("/entry/detector/pixel_sum", pixel_sum.vec());
-    if (!processing_time.empty())
-        data_file.SaveVector("/entry/detector/processing_time", processing_time.vec())->Units("s");
+    const std::string prefix = integrated_format ? "/entry/instrument/detector/detectorSpecific" : "/entry/detector";
 
-    data_file.SaveVector("/entry/detector/data_collection_efficiency_image", efficiency.vec());
+    if (!jf_info.empty())
+        data_file.SaveVector(prefix + "/det_info", jf_info.vec());
+    if (!storage_cell.empty())
+        data_file.SaveVector(prefix + "/storage_cell_image", storage_cell.vec());
+    if (!receiver_aq_dev_delay.empty())
+        data_file.SaveVector(prefix + "/rcv_delay", receiver_aq_dev_delay.vec());
+    if (!receiver_free_buffers.empty())
+        data_file.SaveVector(prefix + "/rcv_free_send_buffers", receiver_free_buffers.vec());
+    if (!packets_received.empty())
+        data_file.SaveVector(prefix + "/packets_received", packets_received.vec());
+    if (!packets_expected.empty())
+        data_file.SaveVector(prefix + "/packets_expected", packets_expected.vec());
+    if (!pixel_sum.empty())
+        data_file.SaveVector(prefix + "/pixel_sum", pixel_sum.vec());
+    if (!processing_time.empty())
+        data_file.SaveVector(prefix + "/processing_time", processing_time.vec())->Units("s");
+
+    data_file.SaveVector(prefix + "/data_collection_efficiency_image", efficiency.vec());
 }