Stream_name and capture_method args updated

This commit is contained in:
jaknapper 2025-05-02 13:40:41 +01:00 committed by Julian Stirling
parent 8bc0573ab1
commit de7ffb9d1e
3 changed files with 4 additions and 3 deletions

View file

@ -33,7 +33,7 @@ from labthings_fastapi.dependencies.invocation import InvocationLogger
from .camera import RawCameraDependency as Camera from .camera import RawCameraDependency as Camera
from .camera import CameraDependency as WrappedCamera from .camera import CameraDependency as WrappedCamera
from .stage import StageDependency as Stage from .stage import StageDependency as Stage
from .capture import CaptureThing, _save_capture from .capture import CaptureThing
import numpy as np import numpy as np
from pydantic import BaseModel from pydantic import BaseModel

View file

@ -28,7 +28,7 @@ class CaptureThing(Thing):
cam: CamDep, cam: CamDep,
logger: InvocationLogger, logger: InvocationLogger,
metadata_getter: GetThingStates, metadata_getter: GetThingStates,
stream: str = "main", stream_name: str = "main",
) -> None: ) -> None:
"""Capture an image and save it to disk """Capture an image and save it to disk
@ -39,7 +39,7 @@ class CaptureThing(Thing):
image, metadata = self._capture_array( image, metadata = self._capture_array(
cam, cam,
metadata_getter, metadata_getter,
stream=stream, stream=stream_name,
) )
acquisition_time = time.time() acquisition_time = time.time()
self._save_capture(jpeg_path, image, metadata, logger) self._save_capture(jpeg_path, image, metadata, logger)

View file

@ -694,6 +694,7 @@ class SmartScanThing(Thing):
self._autofocus.run_z_stack( self._autofocus.run_z_stack(
images_dir=self._ongoing_scan_images_dir, images_dir=self._ongoing_scan_images_dir,
stack_dir=site_folder, stack_dir=site_folder,
capture_method="hires_array",
) )
# increment capure counter as thread has completed # increment capure counter as thread has completed