Use new Butler.get_dataset_type and Butler.find_dataset APIs

lsst · Nov 3, 2023 · 8d99273 · 8d99273
1 parent e1ab719
commit 8d99273
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/python/lsst/pipe/base/prerequisite_helpers.py b/python/lsst/pipe/base/prerequisite_helpers.py
@@ -284,7 +284,7 @@ def find(
                 # and when that happens PrerequisiteFinder.find never gets
                 # called.
                 try:
-                    ref = butler.registry.findDataset(
+                    ref = butler.find_dataset(
                         self.dataset_type_node.dataset_type,
                         data_id.subset(self.constraint_dimensions),
                         collections=input_collections,

diff --git a/python/lsst/pipe/base/quantum_graph_builder.py b/python/lsst/pipe/base/quantum_graph_builder.py
@@ -223,9 +223,7 @@ def __init__(
             self.skip_existing_starts_with_output_run = False
         self.existing_datasets = ExistingDatasets()
         try:
-            packages_storage_class = butler.registry.getDatasetType(
-                acc.PACKAGES_INIT_OUTPUT_NAME
-            ).storageClass_name
+            packages_storage_class = butler.get_dataset_type(acc.PACKAGES_INIT_OUTPUT_NAME).storageClass_name
         except MissingDatasetTypeError:
             packages_storage_class = acc.PACKAGES_INIT_OUTPUT_STORAGE_CLASS
         self._global_init_output_types = {
@@ -941,9 +939,7 @@ def _find_empty_dimension_datasets(self) -> None:
                 # Dataset type is an overall input; we always need to try to
                 # find these.
                 try:
-                    ref = self.butler.registry.findDataset(
-                        dataset_type.name, collections=self.input_collections
-                    )
+                    ref = self.butler.find_dataset(dataset_type.name, collections=self.input_collections)
                 except MissingDatasetTypeError:
                     ref = None
                 if ref is not None:
@@ -953,9 +949,7 @@ def _find_empty_dimension_datasets(self) -> None:
                 # if only they're from previously executed quanta that we might
                 # skip...
                 try:
-                    ref = self.butler.registry.findDataset(
-                        dataset_type.name, collections=self.skip_existing_in
-                    )
+                    ref = self.butler.find_dataset(dataset_type.name, collections=self.skip_existing_in)
                 except MissingDatasetTypeError:
                     ref = None
                 if ref is not None:
@@ -966,7 +960,7 @@ def _find_empty_dimension_datasets(self) -> None:
                 # ...or if they're in the way and would need to be clobbered
                 # (and we haven't already found them in the previous block).
                 try:
-                    ref = self.butler.registry.findDataset(dataset_type.name, collections=[self.output_run])
+                    ref = self.butler.find_dataset(dataset_type.name, collections=[self.output_run])
                 except MissingDatasetTypeError:
                     ref = None
                 if ref is not None:

diff --git a/python/lsst/pipe/base/testUtils.py b/python/lsst/pipe/base/testUtils.py
@@ -264,16 +264,16 @@ def _refFromConnection(
     _checkDimensionsMatch(universe, set(connection.dimensions), dataId.keys())
     dataId = DataCoordinate.standardize(dataId, **kwargs, universe=universe)
 
-    datasetType = butler.registry.getDatasetType(connection.name)
+    datasetType = butler.get_dataset_type(connection.name)
 
     try:
-        butler.registry.getDatasetType(datasetType.name)
+        butler.get_dataset_type(datasetType.name)
     except KeyError:
         raise ValueError(f"Invalid dataset type {connection.name}.") from None
     if not butler.run:
         raise ValueError("Can not create a resolved DatasetRef since the butler has no default run defined.")
     try:
-        registry_ref = butler.registry.findDataset(datasetType, dataId, collections=[butler.run])
+        registry_ref = butler.find_dataset(datasetType, dataId, collections=[butler.run])
         if registry_ref:
             ref = registry_ref
         else: