Merge: Simplify code for merging, make it more efficient

2026-05-13 12:27:43 +02:00
parent 02327bf610
commit d5b928fa73
7 changed files with 228 additions and 251 deletions
@@ -281,11 +281,14 @@ void IndexAndRefine::ScaleImage(size_t n, ScaleOnTheFly &scaling, ScalingResult
 }

 ScalingResult IndexAndRefine::ScaleAllImages(size_t nthreads) {
-    auto merge_result = MergeReflections(reflections, experiment);
-    ScaleOnTheFly scaling(merge_result.merged, experiment);
+    auto merge_result = MergeAll(experiment, reflections);
+    ScaleOnTheFly scaling(merge_result, experiment);
    return scaling.Scale(reflections, mosaicity, nthreads);
 }

-MergeResult IndexAndRefine::Merge() {
-    return MergeReflections(reflections, experiment);
+MergeResult IndexAndRefine::Merge() const {
+    MergeResult out;
+    out.merged = MergeAll(experiment, reflections);
+    out.statistics = MergeStats(experiment, out.merged, reflections);
+    return out;
 }