Update result shape merging logic in dst_n_to_1 function to skip the first source object when keeping results

Author: PierreRaybaut

cdl/tests/features/common/resultshapes_app_test.py

@@ -49,7 +49,16 @@ def __check_resultshapes_merge(
         obj1: Original object
         obj2: Merged object
     """
-    for rs1, rs2 in zip(obj1.iterate_resultshapes(), obj2.iterate_resultshapes()):
+    rsl1, rsl2 = list(obj1.iterate_resultshapes()), list(obj2.iterate_resultshapes())
+    assert len(rsl2) == len(rsl1), (
+        "Merged object the same number of result shapes as original object, "
+        "but expected twice the number of result shapes for each type."
+    )
+    for rs1, rs2 in zip(rsl1, rsl2):
+        assert rs1.array.shape[0] * 2 == rs2.array.shape[0], (
+            f"Result shape array length mismatch: {rs1.array.shape[0]} * 2 != "
+            f"{rs2.array.shape[0]}"
+        )
         assert np.all(np.vstack([rs1.array, rs1.array])[:, 1:] == rs2.array[:, 1:])
 
 

sigima_/computation/base.py

@@ -251,8 +251,11 @@ def dst_n_to_1(
     dst.roi = None
     if not options.keep_results.get():
         dst.delete_results()  # Remove any previous results
-    for src_obj in src_list:
-        if options.keep_results.get():
+    for index, src_obj in enumerate(src_list):
+        if options.keep_results.get() and index > 0:
+            # If we keep results, we need to merge the result shapes.
+            # We skip the first object, as it is already copied
+            # to the destination object.
             dst.update_resultshapes_from(src_obj)
         if src_obj.roi is not None:
             if dst.roi is None: