diff --git a/eco/acquisition/daq_client.py b/eco/acquisition/daq_client.py index 40bff10..df985ce 100644 --- a/eco/acquisition/daq_client.py +++ b/eco/acquisition/daq_client.py @@ -124,6 +124,8 @@ class Daq(Assembly): def start(self, label=None, **kwargs): starttime_local = time.time() + while self.pulse_id._pv.get_timevars() is None: + time.sleep(0.02) while self.pulse_id._pv.get_timevars()["timestamp"] < starttime_local: time.sleep(0.02) start_id = self.pulse_id.get_current_value(use_monitor=False) diff --git a/eco/bernina/bernina.py b/eco/bernina/bernina.py index 5aac99c..2dc3a55 100644 --- a/eco/bernina/bernina.py +++ b/eco/bernina/bernina.py @@ -2185,6 +2185,7 @@ class Incoupling(Assembly): self._append(SmaractRecord, "SARES23-LIC:MOT_16", name="rx", is_setting=True) self._append(SmaractRecord, "SARES23-LIC:MOT_15", name="y", is_setting=True) self._append(MotorRecord, "SARES20-MF2:MOT_5", name="x",is_setting=True) + self._append(SmaractRecord, "SARES23-USR:MOT_2", name="focus_pos",is_setting=True) try: self.motor_configuration_thorlabs = {