From 99d789e8cf9ac3f3c3951262ab65774271924d27 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 13 Mar 2024 19:03:24 +0100
Subject: [PATCH] Fix: get recursive_subschema_scene from
calngUtils.scene_utils
---
src/calng/CalibrationManager.py | 3 ++-
src/calng/base_correction.py | 11 +++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/calng/CalibrationManager.py b/src/calng/CalibrationManager.py
index ab4eb34d..78523ca6 100644
--- a/src/calng/CalibrationManager.py
+++ b/src/calng/CalibrationManager.py
@@ -18,6 +18,7 @@ import re
from tornado.httpclient import AsyncHTTPClient, HTTPError
from tornado.platform.asyncio import AsyncIOMainLoop, to_asyncio_future
+from calngUtils import scene_utils
from karabo.middlelayer import (
KaraboError, Device, DeviceClientBase, Descriptor, Hash, Configurable,
Slot, Node, Type, Schema, ProxyFactory,
@@ -306,7 +307,7 @@ class CalibrationManager(DeviceClientBase, Device):
prefix = name[len('browse_schema:'):]
else:
prefix = 'managedKeys'
- scene_data = scenes.recursive_subschema_scene(
+ scene_data = scene_utils.recursive_subschema_scene(
self.deviceId,
self.getDeviceSchema(),
prefix,
diff --git a/src/calng/base_correction.py b/src/calng/base_correction.py
index f513b8f2..414b3342 100644
--- a/src/calng/base_correction.py
+++ b/src/calng/base_correction.py
@@ -11,7 +11,14 @@ from timeit import default_timer
import dateutil.parser
import numpy as np
from geometryDevices import utils as geom_utils
-from calngUtils import device as device_utils, misc, shmem_utils, timing, trackers
+from calngUtils import (
+ device as device_utils,
+ misc,
+ scene_utils,
+ shmem_utils,
+ timing,
+ trackers,
+)
from karabo.bound import (
BOOL_ELEMENT,
DOUBLE_ELEMENT,
@@ -954,7 +961,7 @@ class BaseCorrection(PythonDevice):
prefix = name[len("browse_schema:") :]
else:
prefix = "managed"
- payload["data"] = scenes.recursive_subschema_scene(
+ payload["data"] = scene_utils.recursive_subschema_scene(
self.getInstanceId(),
self.getFullSchema(),
prefix,
--
GitLab