Adapt to middleware-internal API changes.

lsst · Sep 6, 2024 · 8044d6f · 8044d6f
1 parent 3f710bc
commit 8044d6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/python/lsst/pipe/base/prerequisite_helpers.py b/python/lsst/pipe/base/prerequisite_helpers.py
@@ -154,10 +154,7 @@ def __init__(
         self.constraint_dimensions = self.task_node.dimensions
         if self.lookup_function is None:
             for family in self.dataset_type_node.dimensions.spatial - self.task_node.dimensions.spatial:
-                best_spatial_element = family.choose(
-                    self.dataset_type_node.dimensions.elements,
-                    self.dataset_type_node.dimensions.universe,
-                )
+                best_spatial_element = family.choose(self.dataset_type_node.dimensions)
                 if isinstance(best_spatial_element, SkyPixDimension):
                     self.dataset_skypix[best_spatial_element.name] = best_spatial_element
                 else:

diff --git a/python/lsst/pipe/base/tests/mocks/_data_id_match.py b/python/lsst/pipe/base/tests/mocks/_data_id_match.py
@@ -171,6 +171,8 @@ def match(self, dataId: DataId) -> bool:
             Raised when expression includes valid but unsupported syntax, e.g.
             function call.
         """
+        if self.tree is None:
+            return True
         visitor = _DataIdMatchTreeVisitor(dataId)
         result = self.tree.visit(visitor)
         if not isinstance(result, bool):