From ba4f10cbda01439d84a94937057efd3614a3974d Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <philipp.schmidt@xfel.eu>
Date: Thu, 16 May 2024 16:42:34 +0200
Subject: [PATCH] Add manager path compatibility with new pclayer release
---
src/calng/CalibrationManager.py | 7 +++++--
src/calng/scenes.py | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index c3957145..2678a612 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -492,7 +492,7 @@ class CalibrationManager(DeviceClientBase, Device):
# List of tuple (remote key, local key, descriptor)
_managed_daq_keys = [
(
- 'DataDispatcher.trainStride', 'daqTrainStride',
+ 'pipeline.dispatcher.trainStride', 'daqTrainStride',
UInt32(displayedName='DAQ train stride',
unitSymbol=Unit.COUNT,
defaultValue=5,
@@ -625,7 +625,10 @@ class CalibrationManager(DeviceClientBase, Device):
# going up first.
return
- elif class_id == 'DataAggregator' and self._is_daq_device(device_id):
+ elif (
+ class_id.startswith('DataAggregator')
+ and self._is_daq_device(device_id)
+ ):
# This device is a data aggregator belonging to the detector
# installation
self._daq_device_ids.add(device_id)
diff --git a/src/calng/scenes.py b/src/calng/scenes.py
index 417e72e0..aeaaa42a 100644
--- a/src/calng/scenes.py
+++ b/src/calng/scenes.py
@@ -697,7 +697,7 @@ class CompactDaqOverview(HorizontalLayout):
font_size=9,
),
DisplayLabelModel(
- keys=[f"{device_id}.DataDispatcher.trainStride"],
+ keys=[f"{device_id}.pipeline.dispatcher.trainStride"],
width=4 * BASE_INC,
height=BASE_INC,
),
--
GitLab