Skip to content
Snippets Groups Projects
Commit 74d39b40 authored by David Hammer's avatar David Hammer
Browse files

Merge branch '2025-winter-bud-fixes' of...

Merge branch '2025-winter-bud-fixes' of ssh://git.xfel.eu:10022/calibration/calng into 2025-winter-bud-fixes
parents 0513477a 1a000acb
No related branches found
No related tags found
2 merge requests!145Fixes found during BUD winter 2025,!118Draft: MID: put arbiter on manager scene
......@@ -37,6 +37,13 @@ class Gotthard2Assembler(TrainMatcher.TrainMatcher):
.dataSchema(schemas.preview_schema(wrap_image_in_imagedata=False))
.commit(),
STRING_ELEMENT(expected)
.key("managerDevice")
.displayedName("Manager device")
.assignmentInternal()
.defaultValue("")
.commit(),
STRING_ELEMENT(expected)
.key("geometryDevice")
.displayedName("[Unused] Geometry device")
......
......@@ -138,9 +138,9 @@ class FrameselectionFriend:
def get_mask(self, sources):
if self._enabled and self._arbiter in sources:
return np.array(
sources[self._arbiter][0]["data.dataFramePattern"], copy=False
).astype(bool, copy=False)
return np.asarray(
sources[self._arbiter][0]["data.dataFramePattern"], dtype=bool
)
else:
return None
......@@ -171,8 +171,7 @@ class FrameselectionFriend:
if not arbiter.has(mask_key):
# no mask
continue
mask = np.array(
arbiter[mask_key], dtype=bool, copy=False)
mask = np.asarray(arbiter[mask_key], dtype=bool)
for source, data in correction_sources.items():
if not data.has(arg):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment