From 7da11531e979be9e3e615fa2bc9678a2eb8c8254 Mon Sep 17 00:00:00 2001
From: David Hammer <dhammer@mailbox.org>
Date: Wed, 18 Oct 2023 13:53:17 +0200
Subject: [PATCH] Pass the correct order of configuration nodes
---
src/calng/ShmemTrainMatcher.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/calng/ShmemTrainMatcher.py b/src/calng/ShmemTrainMatcher.py
index 0de5b1d0..3e0f64ca 100644
--- a/src/calng/ShmemTrainMatcher.py
+++ b/src/calng/ShmemTrainMatcher.py
@@ -86,7 +86,7 @@ class ShmemTrainMatcher(TrainMatcher.TrainMatcher):
super().initialization()
self._shmem_handler = shmem_utils.ShmemCircularBufferReceiver()
self._stacking_friend = StackingFriend(
- self, self.get("merge"), self.get("sources")
+ self, self.get("sources"), self.get("merge")
)
self._frameselection_friend = FrameselectionFriend(self.get("frameSelector"))
self._thread_pool = concurrent.futures.ThreadPoolExecutor(
@@ -102,7 +102,7 @@ class ShmemTrainMatcher(TrainMatcher.TrainMatcher):
def preReconfigure(self, conf):
super().preReconfigure(conf)
if conf.has("merge") or conf.has("sources"):
- self._stacking_friend.reconfigure(conf.get("merge"), conf.get("sources"))
+ self._stacking_friend.reconfigure(conf.get("sources"), conf.get("merge"))
# re-prepare in postReconfigure after sources *and* merge are in self
if conf.has("frameSelector"):
self._frameselection_friend.reconfigure(conf.get("frameSelector"))
--
GitLab