From 6a73ea3c4d0be00e193d91b24aadfdd15080b0ee Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 18 Sep 2024 14:55:13 +0200
Subject: [PATCH] Manager no longer needs to worry about sendGeometry
---
src/calng/CalibrationManager.py | 27 ---------------------------
1 file changed, 27 deletions(-)
diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index 7c016419..346602df 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -1058,22 +1058,6 @@ class CalibrationManager(DeviceClientBase, Device):
if info['status'].startswith(state):
return
- async def _ensure_assemblers_active(self):
- """Ensure assemblers are in ACTIVE state."""
-
- # This coroutine may throw an AsyncTimeoutError to be handled
- # by the calling site.
-
- with ExitStack() as stack:
- assemblers = [stack.enter_context(
- await wait_for(getDevice(device_id), timeout=3))
- for device_id in self._assembler_device_ids]
-
- await wait_for(gather(*[
- waitUntil(lambda: assembler.state == State.ACTIVE)
- for assembler in assemblers]),
- timeout=3)
-
async def _check_servers(self):
"""Validate device server configuration."""
@@ -1419,17 +1403,6 @@ class CalibrationManager(DeviceClientBase, Device):
# Force managed DAQ settings.
await self._apply_managed_values(daq=True)
- # Try waiting until assemblers are active.
- try:
- await self._ensure_assemblers_active()
- except AsyncTimeoutError:
- self._set_status('One or more assemblers missing or not in '
- 'active state after timeout - geometry may '
- 'require manual update')
-
- # Ask the geometry device to re-send its geometry.
- callNoWait(self.geometryDevice.value, 'sendGeometry')
-
self._set_status('All devices instantiated')
self.state = State.ACTIVE
--
GitLab