mx/Jungfraujoch
3
2 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 85 Wiki Activity

RotationScaleMerge: the fulls' own deviation is handed back however the loop stopped (RESULT-CHANGING)

Browse Source 
ShrinkToRestrained ran only off a fulls loop that reported itself converged, so whether each frame
kept what its own fulls say beyond the smooth curve depended on whether the last step happened to
cross the tolerance: one sweep's ISa read 35.09 or 34.46 by how its loop stopped. The hand-back is a
continuous decision already - each frame keeps the fraction its observations support, read off the
lag-1 covariance of the sweep's deviations - so it is now applied after every fulls loop.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PXc1zD1yxHqaR1DGdCTHL4
This commit is contained in:
leonarski_fandClaude Opus 5.5 committed 2026-10-19 19:45:27 +02:00
1 parent 7bb8bc4812
commit dd75c6eb2b
1 file changed
+17 -18
Download Patch File Download Diff File Expand all files Collapse all files
image_analysis/scale_merge/RotationScaleMerge.cpp
+17 -18
View File
@@ -2098,25 +2098,24 @@ RotationScaleMerge::ScalingLoopOutcome RotationScaleMerge::RunFullsScalingLoop(
if (stop) break;
}
// The curve is the part of the scale the frames share over a rocking curve and more; what a
// frame's own fulls say beyond it is handed back by how much of it is real (ShrinkToRestrained) -
// only off a loop that settled, since a loop still walking has measured nothing to hand back.
if (out.converged) {
fit();
std::vector<uint8_t> fitted(n_frames);
for (int f = 0; f < n_frames; ++f)
fitted[f] = frame_scaled_scratch[f] && frame_info_scratch[f] > 0.0 ? 1 : 0;
g_new = g;
ShrinkToRestrained("fulls", g, fitted, frame_obs_count, g_fit);
for (int f = 0; f < n_frames; ++f)
if (fitted[f] && std::isfinite(g_fit[f]) && g_fit[f] > 0.0) g_new[f] = g_fit[f];
const double g_ref = TypicalFrameScale(g_new, n_obs);
for (int f = 0; f < n_frames; ++f) {
g_new[f] /= g_ref;
ratio[f] = g[f] / g_new[f];
}
rescale(has_fulls, ratio);
g = g_new;
// frame's own fulls say beyond it is handed back by how much of it is real (ShrinkToRestrained),
// however the loop stopped: what is real is read off the frames themselves, and a hand-back that
// depended on whether the last step crossed the tolerance moved ISa by 0.6 on one sweep.
fit();
std::vector<uint8_t> fitted(n_frames);
for (int f = 0; f < n_frames; ++f)
fitted[f] = frame_scaled_scratch[f] && frame_info_scratch[f] > 0.0 ? 1 : 0;
g_new = g;
ShrinkToRestrained("fulls", g, fitted, frame_obs_count, g_fit);
for (int f = 0; f < n_frames; ++f)
if (fitted[f] && std::isfinite(g_fit[f]) && g_fit[f] > 0.0) g_new[f] = g_fit[f];
const double g_ref = TypicalFrameScale(g_new, n_obs);
for (int f = 0; f < n_frames; ++f) {
g_new[f] /= g_ref;
ratio[f] = g[f] / g_new[f];
}
rescale(has_fulls, ratio);
g = g_new;
frame_scaled_scratch = has_fulls;
out.best_step = best_step;
std::vector<double> positive;