From e59f11cb440e93170e77acb1d788fbb9059875f7 Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Wed, 20 May 2026 10:27:20 +0200 Subject: [PATCH] jfjoch_process: Simplify writing result of space group search, without Logger --- tools/jfjoch_process.cpp | 30 +----------------------------- tools/jfjoch_scale.cpp | 12 +----------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/tools/jfjoch_process.cpp b/tools/jfjoch_process.cpp index 218b6a17..21003c88 100644 --- a/tools/jfjoch_process.cpp +++ b/tools/jfjoch_process.cpp @@ -753,35 +753,7 @@ int main(int argc, char **argv) { const auto sg_search = SearchSpaceGroup(merged_reflections, sg_opts); - logger.Info(""); - { - std::istringstream iss(SearchSpaceGroupResultToText(sg_search)); - std::string line; - while (std::getline(iss, line)) { - if (!line.empty()) - logger.Info("{}", line); - } - } - logger.Info(""); - /* - if (sg_search.best_space_group.has_value()) { - logger.Info("Re-running scaling in detected space group {}", sg_search.best_space_group->short_name()); - - scale_opts.space_group = *sg_search.best_space_group; - - auto rescale_start = std::chrono::steady_clock::now(); - auto refined_scale_result = indexer.ScaleAllImages(scale_opts); - auto refined_merge_result = indexer.Merge(scale_opts); - auto rescale_end = std::chrono::steady_clock::now(); - - if (refined_scale_result) { - scale_result = std::move(refined_scale_result); - merge_result = std::move(refined_merge_result); - scale_time += std::chrono::duration(rescale_end - rescale_start).count(); - } - } else { - logger.Warning("No space group accepted; keeping P1-merged result"); - } */ + std::cout << std::endl << SearchSpaceGroupResultToText(sg_search) << std::endl << std::endl; } std::cout << merged_statistics; diff --git a/tools/jfjoch_scale.cpp b/tools/jfjoch_scale.cpp index 8b5c3396..e9807260 100644 --- a/tools/jfjoch_scale.cpp +++ b/tools/jfjoch_scale.cpp @@ -347,17 +347,7 @@ int main(int argc, char **argv) { sg_opts.test_systematic_absences = true; const auto sg_search = SearchSpaceGroup(merge_result, sg_opts); - - logger.Info(""); - { - std::istringstream iss(SearchSpaceGroupResultToText(sg_search)); - std::string line; - while (std::getline(iss, line)) { - if (!line.empty()) - logger.Info("{}", line); - } - } - logger.Info(""); + std::cout << std::endl << SearchSpaceGroupResultToText(sg_search) << std::endl; } // Print resolution-shell statistics table