Merge pull request #42 from APS-4ID-POLAR/tweaks

Tweaks
APS-4ID-POLAR · Nov 15, 2024 · 2acfeae · 2acfeae
2 parents 040e96d + ab3aed8
commit 2acfeae
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/src/instrument/devices/hhl_mirror.py b/src/instrument/devices/hhl_mirror.py
@@ -20,7 +20,7 @@ class ToroidalMirror(Device):
     ds_bend = Component(EpicsMotor, 'm5', labels=('motor',))
 
     # Combined motions
-    lateral = Component(EpicsMotor, 'pm1', labels=('motor',))
+    x = Component(EpicsMotor, 'pm1', labels=('motor',))
     pitch = Component(EpicsMotor, 'pm2', labels=('motor',))
     # TODO: this fine pitch is in 4ida?
     # fine_pitch = Component(EpicsMotor, 'pm1', labels=('motor'))

diff --git a/src/instrument/devices/monochromator.py b/src/instrument/devices/monochromator.py
@@ -18,6 +18,8 @@
 from ..utils._logging_setup import logger
 logger.info(__file__)
 
+KOHZU_SETTLE_TIME = 0.1
+
 
 class MonoFeedback(Device):
     """ Mono feedback reading """
@@ -135,26 +137,36 @@ class Monochromator(KohzuSeqCtl_Monochromator):
     """ Tweaks from apstools mono """
 
     wavelength = Component(
-        KohzuPositioner, "", readback_pv="BraggLambdaRdbkAO",
-        setpoint_pv="BraggLambdaAO"
+        KohzuPositioner,
+        "",
+        readback_pv="BraggLambdaRdbkAO",
+        setpoint_pv="BraggLambdaAO",
+        settle_time=KOHZU_SETTLE_TIME
     )
 
     energy = Component(
-        KohzuPositioner, "", readback_pv="BraggERdbkAO", setpoint_pv="BraggEAO"
+        KohzuPositioner,
+        "",
+        readback_pv="BraggERdbkAO",
+        setpoint_pv="BraggEAO",
+        settle_time=KOHZU_SETTLE_TIME
     )
 
-    theta = Component(
-        KohzuPositioner, "", readback_pv="BraggThetaRdbkAO",
-        setpoint_pv="BraggThetaAO"
-    )
+    theta = Component(EpicsMotor, 'm1', labels=('motor',))
 
-    theta_motor = Component(EpicsMotor, 'm1', labels=('motor',))
+    theta_kohzu_screen = Component(
+        KohzuPositioner,
+        "",
+        readback_pv="BraggThetaRdbkAO",
+        setpoint_pv="BraggThetaAO",
+        settle_time=KOHZU_SETTLE_TIME
+    )
 
     y1 = None
     crystal_select = Component(EpicsMotor, 'm2', labels=('motor',))
 
     x2 = None
-    y2 = Component(EpicsSignal, 'm3', labels=('motor',))
+    y2 = Component(EpicsMotor, 'm3', labels=('motor',))
     z2 = Component(EpicsSignalRO, 'Zdummy', labels=('motor',))
 
     thf2 = Component(EpicsMotor, 'm4', labels=('motor',))

diff --git a/src/instrument/plans/local_scans.py b/src/instrument/plans/local_scans.py
@@ -214,9 +214,9 @@ def setup_nxwritter(_base_path, _master_fullpath, _rel_dets_paths):
 
 
 def count(
-        detectors=None,
         num=1,
         time=None,
+        detectors=None,
         delay=None,
         md=None,
         per_shot=None,
@@ -229,15 +229,15 @@ def count(
     cannot be set here, as it is used for dichro scans.
     Parameters
     ----------
-    detectors : list, optional
-        List of 'readable' objects. If None, will use the detectors defined in
-        `counters.detectors`.
     num : integer, optional
         number of readings to take; default is 1
         If None, capture data until canceled
     time : float, optional
         If a number is passed, it will modify the counts over time. All
         detectors need to have a .preset_monitor signal.
+    detectors : list, optional
+        List of 'readable' objects. If None, will use the detectors defined in
+        `counters.detectors`.
     delay : iterable or scalar, optional
         Time delay in seconds between successive readings; default is 0.
     md : dict, optional