Files
Jungfraujoch/common/ScanResultGenerator.cpp
T
leonarski_fandClaude Opus 5 14e2bf3c0f Merge rc167 into the detection-score branch
Both lanes added a per-image scalar to the same eleven files, so every conflict was two
additions competing for one line. All were resolved by keeping both, with three that needed
more than that:

- ScanResultGenerator: rc167 changed the per-image float vectors to resize(n, NAN) so a frame
  that never arrived does not read back as a real 0. v_protein_score and v_ice_score are exactly
  that case - 0 is a real answer ("nothing detected here") - so they take the NAN default too.
- HDF5MetadataSource: rc167 established that NaN in a stored per-image array means "no value" and
  the optional must come back absent. The two detection scores now follow it, which they did not
  before the merge; without the guard a missing score would come back as a NaN that a threshold
  would silently compare against.
- CBORTest: designated initialisers must follow member declaration order, so spindle_blind_fraction
  precedes the two scores in the DataMessage aggregate.

Verified after the merge that every CBOR key that is encoded is also decoded (198 encoded keys,
one intentional exception: the "type" discriminator), that both lanes' fields survive in the
writer, the reader, the plots and the API, and that a stored file still round-trips.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01EFEJG6WBQv8th4UJFNe53N
2026-09-08 00:13:51 +02:00

166 lines
7.6 KiB
C++

// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include <algorithm>
#include <cmath>
#include "ScanResultGenerator.h"
namespace {
template<class T>
T value_or_zero(const std::optional<T>& v) {
return v.value_or(static_cast<T>(0));
}
}
ScanResultGenerator::ScanResultGenerator(const DiffractionExperiment &experiment) {
grid_scan = experiment.GetGridScan();
goniometer_axis = experiment.GetGoniometer();
if (grid_scan)
v.resize(grid_scan->GetNElem());
else
v.resize(experiment.GetImageNum());
file_prefix = experiment.GetFilePrefix();
}
void ScanResultGenerator::Add(const DataMessage &message) {
std::unique_lock ul(m);
int64_t image_number = message.number;
if (grid_scan)
image_number = grid_scan->Rearrange(image_number);
if (image_number >= 0 && static_cast<size_t>(image_number) < v.size()) {
if (grid_scan) {
v[image_number].x = grid_scan->GetElementPosX_step(message.number);
v[image_number].y = grid_scan->GetElementPosY_step(message.number);
} else if (goniometer_axis) {
v[image_number].angle_deg = goniometer_axis->GetAngle_deg(message.number);
}
v[image_number].number = message.number;
v[image_number].pixel_sum = message.pixel_sum;
v[image_number].collection_efficiency = message.image_collection_efficiency.value_or(1.0);
v[image_number].bkg = message.bkg_estimate;
v[image_number].spindle_blind = message.spindle_blind_fraction;
v[image_number].spot_count = message.spot_count;
v[image_number].indexing_solution = message.indexing_result;
v[image_number].indexed_lattice_count = message.indexing_lattice_count;
v[image_number].profile_radius = message.profile_radius;
v[image_number].mosaicity = message.mosaicity_deg;
v[image_number].b_factor = message.b_factor;
v[image_number].uc = message.indexing_unit_cell;
v[image_number].xfel_pulse_id = message.xfel_pulse_id;
v[image_number].err_pixels = message.error_pixel_count;
v[image_number].min_viable_pixel = message.min_viable_pixel_value;
v[image_number].max_viable_pixel = message.max_viable_pixel_value;
v[image_number].sat_pixels = message.saturated_pixel_count;
v[image_number].spot_count_ice = message.spot_count_ice_rings;
v[image_number].spot_count_ice_control = message.spot_count_ice_control;
v[image_number].spot_count_low_res = message.spot_count_low_res;
v[image_number].spot_count_indexed = message.spot_count_indexed;
v[image_number].res = message.resolution_estimate;
v[image_number].integrated_reflections = message.integrated_reflections;
v[image_number].image_scale_factor = message.image_scale_factor;
v[image_number].image_scale_cc = message.image_scale_cc;
v[image_number].ice_ring_score = message.ice_ring_score;
v[image_number].protein_score = message.protein_score;
v[image_number].ice_score = message.ice_score;
if (message.lattice_type)
v[image_number].niggli_class = message.lattice_type->niggli_class;
}
}
ScanResult ScanResultGenerator::GetResult() const {
std::unique_lock ul(m);
ScanResult ret;
ret.file_prefix = file_prefix;
for (const auto &e: v) {
if (e.number >= 0)
ret.images.push_back(e);
}
return ret;
}
void ScanResultGenerator::FillEndMessage(EndMessage &message) const {
std::unique_lock ul(m);
size_t n = 0;
for (const auto &e: v) {
if (e.number >= 0)
n = std::max(n, static_cast<size_t>(e.number) + 1);
}
if (n == 0)
return;
// The vectors the loop below fills with value_or(NAN) are sized with NAN, not with the
// value-initialised zero: an image that never reached the loop at all - dropped, never
// arrived, numbered outside the run - has no measurement, and zero is a measurement. A
// blind fraction of 0.0 reads as "this frame lost nothing", a mosaicity of 0.0 as a
// perfect crystal, and a resolution estimate of 0.0 as nothing at all. The counts keep
// their zeros, because a count of zero is a thing that can be true.
message.data_collection_efficiency.resize(n);
message.spot_count.resize(n);
message.spot_count_ice_ring.resize(n);
message.spot_count_ice_control.resize(n, NAN);
message.spot_count_low_res.resize(n);
message.spot_count_indexed.resize(n);
message.image_indexed.resize(n);
message.v_bkg_estimate.resize(n, NAN);
message.v_spindle_blind_fraction.resize(n, NAN);
message.profile_radius.resize(n, NAN);
message.mosaicity.resize(n, NAN);
message.bFactor.resize(n, NAN);
message.resolution_estimate.resize(n, NAN);
message.min_viable_pixel_value.resize(n);
message.max_viable_pixel_value.resize(n);
message.saturated_pixel_count.resize(n);
message.error_pixel_count.resize(n);
message.image_scale_factor.resize(n, NAN);
message.image_scale_cc.resize(n, NAN);
message.ice_ring_score.resize(n, NAN);
message.v_protein_score.resize(n, NAN);
message.v_ice_score.resize(n, NAN);
message.integrated_reflections.resize(n);
message.niggli_class.resize(n);
message.pixel_sum.resize(n);
message.indexed_lattice_count.resize(n);
for (const auto &e: v) {
if (e.number < 0)
continue;
const auto number = static_cast<size_t>(e.number);
if (number >= n)
continue;
message.data_collection_efficiency[number] = e.collection_efficiency;
message.spot_count[number] = static_cast<int32_t>(value_or_zero(e.spot_count));
message.spot_count_ice_ring[number] = static_cast<int32_t>(value_or_zero(e.spot_count_ice));
message.spot_count_ice_control[number] = e.spot_count_ice_control.value_or(NAN);
message.spot_count_low_res[number] = static_cast<int32_t>(value_or_zero(e.spot_count_low_res));
message.spot_count_indexed[number] = static_cast<int32_t>(value_or_zero(e.spot_count_indexed));
message.image_indexed[number] = static_cast<uint8_t>(e.indexing_solution.value_or(0));
message.v_bkg_estimate[number] = e.bkg.value_or(NAN);
message.v_spindle_blind_fraction[number] = e.spindle_blind.value_or(NAN);
message.profile_radius[number] = e.profile_radius.value_or(NAN);
message.mosaicity[number] = e.mosaicity.value_or(NAN);
message.bFactor[number] = e.b_factor.value_or(NAN);
message.resolution_estimate[number] = e.res.value_or(NAN);
message.min_viable_pixel_value[number] = value_or_zero(e.min_viable_pixel);
message.max_viable_pixel_value[number] = value_or_zero(e.max_viable_pixel);
message.saturated_pixel_count[number] = static_cast<int32_t>(value_or_zero(e.sat_pixels));
message.error_pixel_count[number] = static_cast<int32_t>(value_or_zero(e.err_pixels));
message.image_scale_factor[number] = e.image_scale_factor.value_or(NAN);
message.image_scale_cc[number] = e.image_scale_cc.value_or(NAN);
message.ice_ring_score[number] = e.ice_ring_score.value_or(NAN);
message.v_protein_score[number] = e.protein_score.value_or(NAN);
message.v_ice_score[number] = e.ice_score.value_or(NAN);
message.integrated_reflections[number] = static_cast<int32_t>(value_or_zero(e.integrated_reflections));
message.niggli_class[number] = static_cast<uint8_t>(value_or_zero(e.niggli_class));
message.pixel_sum[number] = value_or_zero(e.pixel_sum);
message.indexed_lattice_count[number] = static_cast<int32_t>(value_or_zero(e.indexed_lattice_count));
}
}