Scaling/Merging: Work in progress to improve the information that is fed to scaling. This is a mess at the moment - with redundant data structures, etc. - will clean this up, later.

tools/jfjoch_process.cpp

@@ -718,7 +718,7 @@ int main(int argc, char **argv) {
             auto scale_start = std::chrono::steady_clock::now();
             for (int i = 0; i < scaling_iter; i++) {
                 auto iter_start = std::chrono::steady_clock::now();
-                auto merge_result = MergeAll(experiment, indexer.GetReflections(), merging_mask_uc);
+                auto merge_result = MergeAll(experiment, indexer.GetIntegrationOutcome(), merging_mask_uc);
                 scale_result = indexer.ScaleAllImages(merge_result);
                 scale_result.SaveToFile(output_prefix + "_iter" + std::to_string(i) + "_scale.dat");
                 auto iter_end = std::chrono::steady_clock::now();
@@ -744,8 +744,8 @@ int main(int argc, char **argv) {
         if (rejected_cc > 0)
             logger.Info("Rejected {} images for merging due to low CC with reference", rejected_cc);
 
-        auto merged_reflections = MergeAll(experiment, indexer.GetReflections(), merging_mask_uc);
-        auto merged_statistics = MergeStats(experiment, merged_reflections, indexer.GetReflections(), *consensus_cell, merging_mask_uc,
+        auto merged_reflections = MergeAll(experiment, indexer.GetIntegrationOutcome(), merging_mask_uc);
+        auto merged_statistics = MergeStats(experiment, merged_reflections, indexer.GetIntegrationOutcome(), *consensus_cell, merging_mask_uc,
             reference_data);
 
         auto merge_end = std::chrono::steady_clock::now();
@@ -789,7 +789,6 @@ int main(int argc, char **argv) {
     double throughput_MBs = static_cast<double>(total_uncompressed_bytes) / (processing_time * 1e6);
     double frame_rate = static_cast<double>(images_to_process) / processing_time;
 
-
     std::cout << fmt::format("Processing time: {:.2f} s", processing_time) << std::endl;
     std::cout << fmt::format("Frame rate:      {:.2f} Hz", frame_rate) << std::endl;
     std::cout << fmt::format("Total throughput:{:.2f} MB/s", throughput_MBs) << std::endl;