From 485f3bcc64ecf602f8c3013b5b0fcfb339324319 Mon Sep 17 00:00:00 2001 From: Mark Wolfman Date: Tue, 9 Jul 2024 10:40:07 -0500 Subject: [PATCH] Blake, flake8 and isort. --- src/haven/instrument/area_detector.py | 3 ++- src/haven/instrument/camera.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/haven/instrument/area_detector.py b/src/haven/instrument/area_detector.py index 830ed527..5a90dddc 100644 --- a/src/haven/instrument/area_detector.py +++ b/src/haven/instrument/area_detector.py @@ -74,10 +74,11 @@ class AsyncCamMixin(OphydObject): class SingleImageModeTrigger(SingleTrigger_V34): """A trigger mixin for cameras that don't support "Multiple" image mode.""" + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) if "cam.image_mode" in self.stage_sigs: - self.stage_sigs['cam.image_mode'] = ImageMode.SINGLE + self.stage_sigs["cam.image_mode"] = ImageMode.SINGLE class SimDetectorCam_V34(CamMixin_V34, SimDetectorCam): ... diff --git a/src/haven/instrument/camera.py b/src/haven/instrument/camera.py index 7bb2b7b4..8cb80d21 100644 --- a/src/haven/instrument/camera.py +++ b/src/haven/instrument/camera.py @@ -2,13 +2,13 @@ from typing import Sequence from ophyd import ADComponent as ADCpt -from ophyd import CamBase, EpicsSignal, Kind, SingleTrigger +from ophyd import CamBase, EpicsSignal, Kind from ophyd.areadetector.plugins import ( + HDF5Plugin_V34, ImagePlugin_V34, OverlayPlugin_V34, PvaPlugin_V34, ROIPlugin_V34, - HDF5Plugin_V34, TIFFPlugin_V34, ) @@ -18,8 +18,8 @@ AsyncCamMixin, DetectorBase, SimDetector, - StatsPlugin_V34, SingleImageModeTrigger, + StatsPlugin_V34, ) from .device import make_device @@ -38,6 +38,7 @@ class AravisDetector(SingleImageModeTrigger, DetectorBase): """ A gige-vision camera described by EPICS. """ + _default_configuration_attrs = ("cam", "hdf", "tiff") cam = ADCpt(AravisCam, "cam1:")