HDF5: Add /entry/instrument/detector/data for all formats
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m33s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m35s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 16m16s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m57s
Build Packages / build:rpm (rocky8) (push) Successful in 18m2s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m12s
Build Packages / build:rpm (rocky9) (push) Successful in 19m3s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m14s
Build Packages / Generate python client (push) Successful in 1m28s
Build Packages / Build documentation (push) Successful in 1m52s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m29s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m4s
Build Packages / XDS test (durin plugin) (push) Failing after 8m55s
Build Packages / XDS test (neggia plugin) (push) Failing after 8m22s
Build Packages / XDS test (JFJoch plugin) (push) Failing after 8m47s
Build Packages / DIALS test (push) Failing after 11m24s
Build Packages / Unit tests (push) Failing after 49m8s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m33s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 13m35s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 16m16s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 16m57s
Build Packages / build:rpm (rocky8) (push) Successful in 18m2s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m12s
Build Packages / build:rpm (rocky9) (push) Successful in 19m3s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m14s
Build Packages / Generate python client (push) Successful in 1m28s
Build Packages / Build documentation (push) Successful in 1m52s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m29s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m4s
Build Packages / XDS test (durin plugin) (push) Failing after 8m55s
Build Packages / XDS test (neggia plugin) (push) Failing after 8m22s
Build Packages / XDS test (JFJoch plugin) (push) Failing after 8m47s
Build Packages / DIALS test (push) Failing after 11m24s
Build Packages / Unit tests (push) Failing after 49m8s
This commit is contained in:
@@ -371,6 +371,21 @@ void NXmx::Detector(const StartMessage &start) {
|
||||
}
|
||||
|
||||
void NXmx::Detector(const StartMessage &start, const EndMessage &end) {
|
||||
hsize_t total_images = end.max_image_number;
|
||||
hsize_t width = start.image_size_x;
|
||||
hsize_t height = start.image_size_y;
|
||||
|
||||
if (start.file_format == FileWriterFormat::NXmxLegacy) {
|
||||
auto data_dataset = VDS(start,
|
||||
"/entry/instrument/detector/data",
|
||||
{total_images, height, width},
|
||||
HDF5DataType(start.bit_depth_image / 8, start.pixel_signed));
|
||||
data_dataset->Attr("image_nr_low", (int32_t) 1)
|
||||
.Attr("image_nr_high",(int32_t) total_images);
|
||||
} else {
|
||||
hdf5_file->HardLink("/entry/data/data", "/entry/instrument/detector/data");
|
||||
}
|
||||
|
||||
if (start.images_per_trigger.has_value() && start.images_per_trigger.value() > 0) {
|
||||
SaveScalar(*hdf5_file, "/entry/instrument/detector/detectorSpecific/nimages", start.images_per_trigger.value());
|
||||
SaveScalar(*hdf5_file, "/entry/instrument/detector/detectorSpecific/ntrigger", (end.max_image_number + start.images_per_trigger.value() - 1)/ start.images_per_trigger.value());
|
||||
|
||||
Reference in New Issue
Block a user