From 4e6a6e2aa288b17352330db0a6b0daae2f06f81d Mon Sep 17 00:00:00 2001 From: leonarski_f Date: Mon, 11 May 2026 13:11:42 +0200 Subject: [PATCH] jfjoch_process: Fixes to parameter logic --- tools/jfjoch_process.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/jfjoch_process.cpp b/tools/jfjoch_process.cpp index 396c1cb2..42ef6e45 100644 --- a/tools/jfjoch_process.cpp +++ b/tools/jfjoch_process.cpp @@ -228,7 +228,7 @@ int main(int argc, char **argv) { break; case 'D': d_min_scale_merge = atof(optarg); - logger.Info("High resolution limit for scaling/merging set to {:.2f} A", d_min_spot_finding); + logger.Info("High resolution limit for scaling/merging set to {:.2f} A", d_min_scale_merge.value()); break; case 'S': space_group_number = atoi(optarg); @@ -357,10 +357,10 @@ int main(int argc, char **argv) { scaling_settings.HighResolutionLimit_A(d_min_scale_merge.value()); scaling_settings.MergeFriedel(!anomalous_mode); scaling_settings.RefineB(refine_bfactor); - if (wedge_for_scaling.has_value()) { - scaling_settings.RefineRotationWedge(true); + scaling_settings.RefineRotationWedge(refine_wedge); + if (wedge_for_scaling.has_value()) scaling_settings.RotationWedgeForScaling(wedge_for_scaling); - } + experiment.ImportScalingSettings(scaling_settings); SpotFindingSettings spot_settings; @@ -491,7 +491,6 @@ int main(int argc, char **argv) { std::chrono::duration image_duration = image_end_time - image_start_time; msg.processing_time_s = image_duration.count(); - msg.original_number = msg.number; msg.run_number = experiment.GetRunNumber(); msg.run_name = experiment.GetRunName(); @@ -715,7 +714,7 @@ int main(int argc, char **argv) { logger.Info("Total throughput:{:.2f} MB/s", throughput_MBs); // Print extended stats similar to Receiver - if (!end_msg.indexing_rate.has_value()) { + if (end_msg.indexing_rate.has_value()) { logger.Info("Indexing rate: {:.2f}%", end_msg.indexing_rate.value() * 100.0); }