From de7ffb9d1ecdcc36249d52aac2d10bb7d8b00869 Mon Sep 17 00:00:00 2001
From: jaknapper <jaknapper@hotmail.com>
Date: Fri, 2 May 2025 13:40:41 +0100
Subject: [PATCH] Stream_name and capture_method args updated

---
 src/openflexure_microscope_server/things/autofocus.py  | 2 +-
 src/openflexure_microscope_server/things/capture.py    | 4 ++--
 src/openflexure_microscope_server/things/smart_scan.py | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/openflexure_microscope_server/things/autofocus.py b/src/openflexure_microscope_server/things/autofocus.py
index 7131cd0d..79a517bd 100644
--- a/src/openflexure_microscope_server/things/autofocus.py
+++ b/src/openflexure_microscope_server/things/autofocus.py
@@ -33,7 +33,7 @@ from labthings_fastapi.dependencies.invocation import InvocationLogger
 from .camera import RawCameraDependency as Camera
 from .camera import CameraDependency as WrappedCamera
 from .stage import StageDependency as Stage
-from .capture import CaptureThing, _save_capture
+from .capture import CaptureThing
 import numpy as np
 from pydantic import BaseModel
 
diff --git a/src/openflexure_microscope_server/things/capture.py b/src/openflexure_microscope_server/things/capture.py
index dc5a1572..904a5bf9 100644
--- a/src/openflexure_microscope_server/things/capture.py
+++ b/src/openflexure_microscope_server/things/capture.py
@@ -28,7 +28,7 @@ class CaptureThing(Thing):
         cam: CamDep,
         logger: InvocationLogger,
         metadata_getter: GetThingStates,
-        stream: str = "main",
+        stream_name: str = "main",
     ) -> None:
         """Capture an image and save it to disk
 
@@ -39,7 +39,7 @@ class CaptureThing(Thing):
         image, metadata = self._capture_array(
             cam,
             metadata_getter,
-            stream=stream,
+            stream=stream_name,
         )
         acquisition_time = time.time()
         self._save_capture(jpeg_path, image, metadata, logger)
diff --git a/src/openflexure_microscope_server/things/smart_scan.py b/src/openflexure_microscope_server/things/smart_scan.py
index 8094f632..ea024bca 100644
--- a/src/openflexure_microscope_server/things/smart_scan.py
+++ b/src/openflexure_microscope_server/things/smart_scan.py
@@ -694,6 +694,7 @@ class SmartScanThing(Thing):
             self._autofocus.run_z_stack(
                 images_dir=self._ongoing_scan_images_dir,
                 stack_dir=site_folder,
+                capture_method="hires_array",
             )
 
             # increment capure counter as thread has completed