IndexAndRefine: Dedicated function to add image to rotation indexer

image_analysis/IndexAndRefine.cpp

@@ -26,11 +26,19 @@ IndexAndRefine::IndexAndRefine(const DiffractionExperiment &x, IndexerThreadPool
     unit_cells.resize(x.GetImageNum());
 }
 
-IndexAndRefine::IndexingOutcome IndexAndRefine::DetermineLatticeAndSymmetryRotation(DataMessage &msg) {
-    auto result = rotation_indexer->GetLattice();
+void IndexAndRefine::AddImageToRotationIndexer(DataMessage &msg) {
+    if (rotation_indexer)
+        rotation_indexer->ProcessImage(msg.number, msg.spots);
+}
 
+IndexAndRefine::IndexingOutcome IndexAndRefine::DetermineLatticeAndSymmetryRotation(DataMessage &msg) {
     IndexingOutcome outcome(experiment);
 
+    if (!rotation_indexer)
+        return outcome;
+
+    auto result = rotation_indexer->GetLattice();
+
     if (!result.has_value()) {
         auto rot_cnt = rotation_indexer_counter.Process(msg.number);
         if (rot_cnt.first)
@@ -301,7 +309,7 @@ void IndexAndRefine::ProcessImage(DataMessage &msg,
         QuickPredictAndIntegrate(msg, spot_finding_settings, image, prediction, outcome);
 }
 
-std::optional<RotationIndexerResult> IndexAndRefine::Finalize() {
+std::optional<RotationIndexerResult> IndexAndRefine::FinalizeRotationIndexing() {
     if (rotation_indexer) {
         if (const auto latt = rotation_indexer->GetLattice())
             return latt;

image_analysis/IndexAndRefine.h

@@ -66,12 +66,14 @@ class IndexAndRefine {
     void ScaleImage(DataMessage &msg, IntegrationOutcome& outcome);
 public:
     IndexAndRefine(const DiffractionExperiment &x, IndexerThreadPool *indexer);
+
+    void AddImageToRotationIndexer(DataMessage &msg);
     void ProcessImage(DataMessage &msg, const SpotFindingSettings &settings, const CompressedImage &image, BraggPrediction &prediction);
     IndexAndRefine& ReferenceIntensities(std::vector<MergedReflection> &reference);
 
     ScalingResult ScaleAllImages(const std::vector<MergedReflection> &reference, size_t nthreads = 0);
 
-    std::optional<RotationIndexerResult> Finalize();
+    std::optional<RotationIndexerResult> FinalizeRotationIndexing();
 
     std::optional<UnitCell> GetConsensusUnitCell() const;
 

receiver/JFJochReceiver.cpp

@@ -161,7 +161,7 @@ void JFJochReceiver::SendEndMessage() {
 
     message.az_int_result["dataset"] = plots.GetAzIntProfile();
 
-    const auto rotation_indexer_ret = indexer.Finalize();
+    const auto rotation_indexer_ret = indexer.FinalizeRotationIndexing();
     if (rotation_indexer_ret.has_value()) {
         message.rotation_lattice = rotation_indexer_ret->lattice;
         message.rotation_lattice_type = LatticeMessage{

tools/jfjoch_process.cpp

@@ -683,7 +683,7 @@ int main(int argc, char **argv) {
 
     // Finalize Indexing (Global) to get rotation lattice
     // We create a temporary IndexAndRefine to call Finalize() which aggregates pool results
-    const auto rotation_indexer_ret = indexer.Finalize();
+    const auto rotation_indexer_ret = indexer.FinalizeRotationIndexing();
 
     if (rotation_indexer_ret.has_value()) {
         end_msg.rotation_lattice = rotation_indexer_ret->lattice;