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

Fix arbiter geometry stuff

parent 43e78f05
No related branches found
No related tags found
2 merge requests!120DetectorAssembler: go to ERROR if trying to match without geometry,!118Draft: MID: put arbiter on manager scene
...@@ -144,9 +144,6 @@ class BaseFrameSelectionArbiter(TrainMatcher.TrainMatcher): ...@@ -144,9 +144,6 @@ class BaseFrameSelectionArbiter(TrainMatcher.TrainMatcher):
) )
self._geometry = None self._geometry = None
geom_utils.subscribe_to_geometry_bound(
self, self.get("geometryDevice"), on_geometry=self._on_geometry
)
def _guess_number_of_frames(self, sources): def _guess_number_of_frames(self, sources):
# TODO: robust frame deduction # TODO: robust frame deduction
...@@ -184,6 +181,9 @@ class SimpleFrameSelectionArbiter(BaseFrameSelectionArbiter): ...@@ -184,6 +181,9 @@ class SimpleFrameSelectionArbiter(BaseFrameSelectionArbiter):
self._initialize_kernel( self._initialize_kernel(
self["frameSelection.kernelChoice"], self["frameSelection.kernelParameters"] self["frameSelection.kernelChoice"], self["frameSelection.kernelParameters"]
) )
geom_utils.subscribe_to_geometry_bound(
self, self.get("geometryDevice"), on_geometry=self._on_geometry
)
if self["state"] != State.ERROR: if self["state"] != State.ERROR:
self.start() # Auto-start this type of matcher. self.start() # Auto-start this type of matcher.
...@@ -307,6 +307,9 @@ class AdvancedFrameSelectionArbiter(BaseFrameSelectionArbiter): ...@@ -307,6 +307,9 @@ class AdvancedFrameSelectionArbiter(BaseFrameSelectionArbiter):
self._validate_plan_and_update_schema(self["frameSelection.plan"]) self._validate_plan_and_update_schema(self["frameSelection.plan"])
self._initialize_kernels() self._initialize_kernels()
self._configure_decision(self["frameSelection.decision"]) self._configure_decision(self["frameSelection.decision"])
geom_utils.subscribe_to_geometry_bound(
self, self.get("geometryDevice"), on_geometry=self._on_geometry
)
if self["state"] != State.ERROR: if self["state"] != State.ERROR:
self.start() # Auto-start this type of matcher. self.start() # Auto-start this type of matcher.
...@@ -517,5 +520,5 @@ class AdvancedFrameSelectionArbiter(BaseFrameSelectionArbiter): ...@@ -517,5 +520,5 @@ class AdvancedFrameSelectionArbiter(BaseFrameSelectionArbiter):
kernel.reconfigure(conf[kernel_prefix]) kernel.reconfigure(conf[kernel_prefix])
def _on_geometry(self, geometry): def _on_geometry(self, geometry):
for kernel in self._selection_kernels.values() for kernel in self._selection_kernels.values():
kernel.on_new_geometry(geometry) kernel.on_new_geometry(geometry)
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