v1.0.0-rc.113 (#19)

This is an UNSTABLE release and not recommended for production use (please use rc.111 instead).

* jfjoch_broker: Improve handling of rotation indexing
* jfjoch_broker: More information saved in CBOR end message (WIP)
* jfjoch_writer: Save rotation indexing lattice parameters and Niggli class
* jfjoch_viewer: Remove (for now) primitive cell information

Reviewed-on: #19
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>

image_analysis/RotationIndexer.cpp

@@ -88,7 +88,7 @@ void RotationIndexer::TryIndex() {
             .crystal_system = search_result_.system,
             .min_spots = experiment.GetIndexingSettings().GetViableCellMinSpots(),
             .refine_beam_center = true,
-            .refine_distance_mm =  true,
+            .refine_distance_mm =  false,
             .axis = axis_
         };
 
@@ -111,7 +111,7 @@ std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image
 
     const auto rot = axis_->GetTransformation(image);
 
-    if (image >= last_accumulated_image + image_stride) {
+    if (!indexed_lattice && image >= last_accumulated_image + image_stride) {
         v_.reserve(v_.size() + spots.size());
         coords_.reserve(coords_.size() + spots.size());
 
@@ -125,8 +125,12 @@ std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image
         accumulated_images++;
         last_accumulated_image = image;
 
-        if (!indexed_lattice && accumulated_images >= min_images_for_indexing && image >= first_image_to_try_indexing)
+        if (!indexed_lattice && accumulated_images >= min_images_for_indexing && image >= first_image_to_try_indexing) {
             TryIndex();
+            // If fails increase rotation range by a factor of two
+            if (!indexed_lattice)
+                first_image_to_try_indexing *= 2;
+        }
     }
 
     if (indexed_lattice) {
@@ -139,9 +143,11 @@ std::optional<RotationIndexerResult> RotationIndexer::ProcessImage(int64_t image
     return {};
 }
 
-std::optional<RotationIndexerResult> RotationIndexer::Finalize(bool retry) {
-    if (!indexed_lattice || retry)
+std::optional<RotationIndexerResult> RotationIndexer::Finalize() {
+    if (!indexed_lattice)
         TryIndex();
+    if (!indexed_lattice)
+        return std::nullopt;
     return RotationIndexerResult{
         .lattice = indexed_lattice.value(),
         .search_result = search_result_,