From e583e2542446054d070654cbab229ea2c003b2dc Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Thu, 14 Nov 2024 17:53:07 +0100 Subject: [PATCH] fix(scans): fixed scans for bec v3 --- phoenix_bec/scans/phoenix_scans.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/phoenix_bec/scans/phoenix_scans.py b/phoenix_bec/scans/phoenix_scans.py index 578772c..2a5f737 100644 --- a/phoenix_bec/scans/phoenix_scans.py +++ b/phoenix_bec/scans/phoenix_scans.py @@ -105,19 +105,9 @@ class PhoenixScanBaseTTL(ScanBase): def _at_each_point(self, ind=None, pos=None): self.p_s("PhoenixScanBaseTT._at_each_point") yield from self._move_scan_motors_and_wait(pos) - if ind > 0: - yield from self.stubs.wait( - wait_type="read", group="primary", wait_group="readout_primary" - ) time.sleep(self.settling_time) - yield from self.stubs.trigger(group="trigger", point_id=self.point_id) - yield from self.stubs.wait(wait_type="trigger", group="trigger", wait_time=self.exp_time) - yield from self.stubs.read( - group="primary", wait_group="readout_primary", point_id=self.point_id - ) - yield from self.stubs.wait( - wait_type="read", group="scan_motor", wait_group="readout_primary" - ) + yield from self.stubs.trigger(min_wait=self.exp_time) + yield from self.stubs.read(group="monitored", point_id=self.point_id) self.point_id += 1 self.p_s("done")