Merge branch '2507-1.0.0-rc.63' into 'main'
Fix to 1.0.0-rc.63 See merge request jungfraujoch/nextgendcu!151
This commit is contained in:
@@ -164,8 +164,6 @@ void JFJochReceiverLite::DataAnalysisThread(uint32_t id) {
|
||||
if (push_images_to_writer)
|
||||
image_pusher.SendCalibration(msg->cbor->calibration.value());
|
||||
} else if (msg->cbor->data_message) {
|
||||
auto image_start_time = std::chrono::high_resolution_clock::now();
|
||||
|
||||
DataMessage data_msg = msg->cbor->data_message.value();
|
||||
|
||||
++images_collected;
|
||||
@@ -173,9 +171,15 @@ void JFJochReceiverLite::DataAnalysisThread(uint32_t id) {
|
||||
uncompressed_size += data_msg.image.GetUncompressedSize();
|
||||
UpdateMaxImageReceived(data_msg.number);
|
||||
|
||||
auto image_start_time = std::chrono::high_resolution_clock::now();
|
||||
|
||||
AzimuthalIntegrationProfile profile(az_int_mapping);
|
||||
analysis->Analyze(data_msg, buffer, profile, GetSpotFindingSettings());
|
||||
|
||||
auto image_end_time = std::chrono::high_resolution_clock::now();
|
||||
std::chrono::duration<float> duration = image_end_time - image_start_time;
|
||||
|
||||
data_msg.processing_time_s = duration.count();
|
||||
data_msg.original_number = data_msg.number;
|
||||
data_msg.user_data = experiment.GetImageAppendix();
|
||||
data_msg.run_number = experiment.GetRunNumber();
|
||||
@@ -194,10 +198,6 @@ void JFJochReceiverLite::DataAnalysisThread(uint32_t id) {
|
||||
plots.Add(data_msg, profile);
|
||||
scan_result.Add(data_msg);
|
||||
|
||||
auto image_end_time = std::chrono::high_resolution_clock::now();
|
||||
std::chrono::duration<float> duration = image_end_time - image_start_time;
|
||||
data_msg.processing_time_s = duration.count();
|
||||
|
||||
if (!serialmx_filter.ApplyFilter(data_msg))
|
||||
++images_skipped;
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user