diff --git a/image_analysis/structure_refinement/Refinement.cpp b/image_analysis/structure_refinement/Refinement.cpp index 2ade4b84b..924ed0803 100644 --- a/image_analysis/structure_refinement/Refinement.cpp +++ b/image_analysis/structure_refinement/Refinement.cpp @@ -4230,10 +4230,18 @@ RefinementResult RefineModel(const gemmi::Structure &placed, const std::vector 1; + RefinementSettings untwinned_settings = settings, twin_settings = settings; + if (halves) { + twin_settings.nthreads = settings.nthreads / 2; + untwinned_settings.nthreads = settings.nthreads - twin_settings.nthreads; + } Logger twin_logger = Logger::Buffered(); CardHeld held; std::future held_bytes = held.bytes.get_future(); @@ -4251,19 +4259,20 @@ RefinementResult RefineModel(const gemmi::Structure &placed, const std::vector budget) + if (!halves && (held_on_card == 0 || 2 * held_on_card > budget)) untwinned.wait(); // A failure here (the card's memory, shared with the untwinned arm) leaves the untwinned result standing. try { - DecideTwin(placed, data, cell, sg, wavelength_A, twin_logger, settings, result, untwinned); + DecideTwin(placed, data, cell, sg, wavelength_A, twin_logger, twin_settings, result, untwinned); } catch (const std::exception &e) { twin_logger.Warning("Refinement: twin hypothesis not tested - {}", e.what()); } }); try { - result = RefineOnce(placed, data, cell, sg, wavelength_A, logger, settings, {}, 0, &held); + result = RefineOnce(placed, data, cell, sg, wavelength_A, logger, untwinned_settings, {}, 0, &held); } catch (...) { result = RefinementResult(); // not ok: the twinned arm decides nothing held.Say(0);