v1.0.0-rc.129 (#36)
Some checks failed
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m14s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m20s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m23s
Build Packages / Generate python client (push) Successful in 39s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m24s
Build Packages / Create release (push) Has been skipped
Build Packages / Build documentation (push) Successful in 1m0s
Build Packages / build:rpm (rocky8) (push) Successful in 10m35s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m35s
Build Packages / build:rpm (rocky9) (push) Successful in 11m17s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m9s
Build Packages / Unit tests (push) Failing after 1h18m57s
Some checks failed
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m14s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 10m43s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 11m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 9m20s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 10m23s
Build Packages / Generate python client (push) Successful in 39s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m24s
Build Packages / Create release (push) Has been skipped
Build Packages / Build documentation (push) Successful in 1m0s
Build Packages / build:rpm (rocky8) (push) Successful in 10m35s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m35s
Build Packages / build:rpm (rocky9) (push) Successful in 11m17s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m9s
Build Packages / Unit tests (push) Failing after 1h18m57s
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.124. * jfjoch_broker: Significant improvements in TCP image socket, as a viable alternative for ZeroMQ sockets (only a single port on broker side, dynamically change number of writers, acknowledgments for written files) * jfjoch_broker: Delta phi is calculated also for still data in Bragg prediction * jfjoch_broker: Image pusher statistics are accessible via the REST interface * jfjoch_writer: Supports TCP image socket and for these auto-forking option Reviewed-on: #36 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #36.
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
#include "HDF5DataFilePluginMX.h"
|
||||
#define RESERVE_IMAGES 1000
|
||||
|
||||
inline std::string to_bravais_code(const std::optional<LatticeMessage> &lm_opt) {
|
||||
if (!lm_opt.has_value()) return "";
|
||||
@@ -50,38 +49,50 @@ HDF5DataFilePluginMX::HDF5DataFilePluginMX(const StartMessage &msg)
|
||||
: max_spots(msg.max_spot_count), indexing(msg.indexing_algorithm != IndexingAlgorithmEnum::None) {
|
||||
}
|
||||
|
||||
void HDF5DataFilePluginMX::OpenFile(HDF5File &data_file, const DataMessage &msg) {
|
||||
bkg_estimate.reserve(RESERVE_IMAGES);
|
||||
void HDF5DataFilePluginMX::OpenFile(HDF5File &data_file, const DataMessage &msg, size_t images_per_file) {
|
||||
bkg_estimate.reserve(images_per_file);
|
||||
|
||||
if (max_spots == 0)
|
||||
return;
|
||||
|
||||
spot_x.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_y.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_int.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_indexed.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_ice_ring.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_h.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_k.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_l.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_dist_ewald.reserve(max_spots * RESERVE_IMAGES);
|
||||
spot_x.reserve(max_spots * images_per_file);
|
||||
spot_y.reserve(max_spots * images_per_file);
|
||||
spot_int.reserve(max_spots * images_per_file);
|
||||
spot_indexed.reserve(max_spots * images_per_file);
|
||||
spot_ice_ring.reserve(max_spots * images_per_file);
|
||||
spot_h.reserve(max_spots * images_per_file);
|
||||
spot_k.reserve(max_spots * images_per_file);
|
||||
spot_l.reserve(max_spots * images_per_file);
|
||||
spot_dist_ewald.reserve(max_spots * images_per_file);
|
||||
|
||||
beam_corr_x.reserve(RESERVE_IMAGES);
|
||||
beam_corr_y.reserve(RESERVE_IMAGES);
|
||||
spot_x.reserve(max_spots * images_per_file);
|
||||
spot_y.reserve(max_spots * images_per_file);
|
||||
spot_int.reserve(max_spots * images_per_file);
|
||||
spot_ice_ring.reserve(max_spots * images_per_file);
|
||||
spot_h.reserve(max_spots * images_per_file);
|
||||
spot_k.reserve(max_spots * images_per_file);
|
||||
spot_l.reserve(max_spots * images_per_file);
|
||||
spot_dist_ewald.reserve(max_spots * images_per_file);
|
||||
if (indexing)
|
||||
spot_indexed.reserve(max_spots * images_per_file);
|
||||
if (indexing)
|
||||
indexed_lattice.reserve(images_per_file * 9);
|
||||
|
||||
npeaks.reserve(RESERVE_IMAGES);
|
||||
strong_pixel_count.reserve(RESERVE_IMAGES);
|
||||
indexed.reserve(RESERVE_IMAGES);
|
||||
profile_radius.reserve(RESERVE_IMAGES);
|
||||
mosaicity_deg.reserve(RESERVE_IMAGES);
|
||||
b_factor.reserve(RESERVE_IMAGES);
|
||||
indexed_lattice.reserve(9 * RESERVE_IMAGES);
|
||||
resolution_estimate.reserve(RESERVE_IMAGES);
|
||||
beam_corr_x.reserve(images_per_file);
|
||||
beam_corr_y.reserve(images_per_file);
|
||||
|
||||
spot_count_total.reserve(RESERVE_IMAGES);
|
||||
spot_count_ice.reserve(RESERVE_IMAGES);
|
||||
spot_count_indexed.reserve(RESERVE_IMAGES);
|
||||
spot_count_low_res.reserve(RESERVE_IMAGES);
|
||||
npeaks.reserve(images_per_file);
|
||||
strong_pixel_count.reserve(images_per_file);
|
||||
indexed.reserve(images_per_file);
|
||||
profile_radius.reserve(images_per_file);
|
||||
mosaicity_deg.reserve(images_per_file);
|
||||
b_factor.reserve(images_per_file);
|
||||
resolution_estimate.reserve(images_per_file);
|
||||
|
||||
spot_count_total.reserve(images_per_file);
|
||||
spot_count_ice.reserve(images_per_file);
|
||||
spot_count_indexed.reserve(images_per_file);
|
||||
spot_count_low_res.reserve(images_per_file);
|
||||
}
|
||||
|
||||
void HDF5DataFilePluginMX::Write(const DataMessage &msg, uint64_t image_number) {
|
||||
|
||||
Reference in New Issue
Block a user