IndexAndRefine: Save scaled reflections
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m53s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m3s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 15m48s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 17m32s
Build Packages / build:rpm (rocky8) (push) Successful in 17m32s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 17m50s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m29s
Build Packages / build:rpm (rocky9) (push) Successful in 10m22s
Build Packages / Generate python client (push) Successful in 33s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m28s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m56s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m5s
Build Packages / XDS test (durin plugin) (push) Successful in 10m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m10s
Build Packages / DIALS test (push) Successful in 12m38s
Build Packages / Unit tests (push) Successful in 1h2m14s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m53s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m3s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 15m48s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 17m32s
Build Packages / build:rpm (rocky8) (push) Successful in 17m32s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 17m50s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m29s
Build Packages / build:rpm (rocky9) (push) Successful in 10m22s
Build Packages / Generate python client (push) Successful in 33s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 8m28s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m56s
Build Packages / XDS test (neggia plugin) (push) Successful in 9m5s
Build Packages / XDS test (durin plugin) (push) Successful in 10m2s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 10m10s
Build Packages / DIALS test (push) Successful in 12m38s
Build Packages / Unit tests (push) Successful in 1h2m14s
This commit is contained in:
@@ -220,11 +220,6 @@ void IndexAndRefine::QuickPredictAndIntegrate(DataMessage &msg,
|
||||
[](const Reflection& a, const Reflection& b) { return a.d < b.d; });
|
||||
}
|
||||
|
||||
{
|
||||
std::unique_lock ul(reflections_mutex);
|
||||
reflections[msg.number] = refl_ret; // Image is not processed twice, so thread-safe in principle, but better safe than sorry :)
|
||||
}
|
||||
|
||||
msg.reflections = std::move(refl_ret);
|
||||
|
||||
CalcISigma(msg);
|
||||
@@ -233,6 +228,11 @@ void IndexAndRefine::QuickPredictAndIntegrate(DataMessage &msg,
|
||||
msg.integration_time_s = std::chrono::duration<float>(integration_end_time - integration_start_time).count();
|
||||
|
||||
ScaleImage(msg);
|
||||
|
||||
{
|
||||
std::unique_lock ul(reflections_mutex);
|
||||
reflections[msg.number] = msg.reflections; // Image is not processed twice, so thread-safe in principle, but better safe than sorry :)
|
||||
}
|
||||
}
|
||||
|
||||
void IndexAndRefine::ProcessImage(DataMessage &msg,
|
||||
|
||||
Reference in New Issue
Block a user