Merge branch 'main' into det_display

src/haven/devices/area_detector.py

@@ -9,7 +9,9 @@
 import pandas as pd
 from apstools.devices import CamMixin_V34, SingleTrigger_V34
 from ophyd import ADComponent as ADCpt
-from ophyd import CamBase
+from ophyd import (
+    CamBase,
+)
 from ophyd import Component as Cpt
 from ophyd import DetectorBase as OphydDetectorBase
 from ophyd import (
@@ -42,7 +44,10 @@
 )
 from ophyd.areadetector.plugins import StatsPlugin_V31 as OphydStatsPlugin_V31
 from ophyd.areadetector.plugins import StatsPlugin_V34 as OphydStatsPlugin_V34
-from ophyd.areadetector.plugins import TIFFPlugin_V31, TIFFPlugin_V34
+from ophyd.areadetector.plugins import (
+    TIFFPlugin_V31,
+    TIFFPlugin_V34,
+)
 from ophyd.flyers import FlyerInterface
 from ophyd.sim import make_fake_device
 from ophyd.status import Status, StatusBase, SubscriptionStatus

src/haven/plans/__init__.py

@@ -48,7 +48,7 @@ def decorator(f):
 
 # Apply decorators to Haven plans
 align_motor = all_decorators(align_motor)
-auto_gain = all_decorators(auto_gain)
+auto_gain = open_shutters_decorator()(auto_gain)
 energy_scan = all_decorators(energy_scan)
 fly_scan = baseline_decorator()(fly_scan)
 grid_fly_scan = baseline_decorator()(grid_fly_scan)

src/haven/plans/_energy_scan.py

@@ -1,6 +1,4 @@
-"""A bluesky plan to scan the X-ray energy and capture detector signals.
-
-"""
+"""A bluesky plan to scan the X-ray energy and capture detector signals."""
 
 import logging
 from collections import ChainMap