DM-39605: Use butler.dimensions rather than butler.registry.dimensions

python/lsst/obs/base/_instrument.py

@@ -351,7 +351,7 @@ def writeCameraGeom(
         run = self.makeUnboundedCalibrationRunName(*labels)
         butler.registry.registerRun(run)
         datasetType = DatasetType(
-            "camera", ("instrument",), "Camera", isCalibration=True, universe=butler.registry.dimensions
+            "camera", ("instrument",), "Camera", isCalibration=True, universe=butler.dimensions
         )
         butler.registry.registerDatasetType(datasetType)
         camera = self.getCamera()
@@ -403,7 +403,7 @@ def writeStandardTextCuratedCalibrations(
             definition = StandardCuratedCalibrationDatasetTypes[datasetTypeName]
             datasetType = DatasetType(
                 datasetTypeName,
-                universe=butler.registry.dimensions,
+                universe=butler.dimensions,
                 isCalibration=True,
                 # MyPy should be able to figure out that the kwargs here have
                 # the right types, but it can't.
@@ -544,7 +544,7 @@ class attribute for curated calibrations corresponding to the
                     dimension_arguments["physical_filter"] = md["FILTER"]
 
                 dataId = DataCoordinate.standardize(
-                    universe=butler.registry.dimensions,
+                    universe=butler.dimensions,
                     instrument=self.getName(),
                     **dimension_arguments,
                 )
@@ -679,7 +679,7 @@ def loadCamera(butler: Butler, dataId: DataId, *, collections: Any = None) -> Tu
     # to ensure it only happens once.
     # This will also catch problems with the data ID not having keys we need.
     try:
-        dataId = butler.registry.expandDataId(dataId, graph=butler.registry.dimensions["exposure"].graph)
+        dataId = butler.registry.expandDataId(dataId, graph=butler.dimensions["exposure"].graph)
     except DataIdError as exc:
         raise LookupError(str(exc)) from exc
     try:

python/lsst/obs/base/defineVisits.py

@@ -461,7 +461,7 @@ def __init__(self, config: DefineVisitsConfig, *, butler: Butler, **kwargs: Any)
         config.validate()  # Not a CmdlineTask nor PipelineTask, so have to validate the config here.
         super().__init__(config, **kwargs)
         self.butler = butler
-        self.universe = self.butler.registry.dimensions
+        self.universe = self.butler.dimensions
         self.progress = Progress("obs.base.DefineVisitsTask")
         self.makeSubtask("groupExposures")
         self.makeSubtask("computeVisitRegions", butler=self.butler)

python/lsst/obs/base/exposureAssembler.py

@@ -120,29 +120,6 @@ def getComponent(self, composite: lsst.afw.image.Exposure, componentName: str) -
                 f"Do not know how to retrieve component {componentName} from {type(composite)}"
             )
 
-    def getValidComponents(self, composite: Exposure) -> Dict[str, Any]:
-        """Extract all non-None components from a composite.
-
-        Parameters
-        ----------
-        composite : `object`
-            Composite from which to extract components.
-
-        Returns
-        -------
-        comps : `dict`
-            Non-None components extracted from the composite, indexed by the
-            component name as derived from the `self.storageClass`.
-        """
-        # For Exposure we call the generic version twice: once for top level
-        # components, and again for ExposureInfo.
-        expItems, expInfoItems = self._groupRequestedComponents()
-
-        components = super().getValidComponents(composite)
-        infoComps = super().getValidComponents(composite.getInfo())
-        components.update(infoComps)
-        return components
-
     def disassemble(
         self, composite: Any, subset: Optional[Iterable] = None, override: Optional[Any] = None
     ) -> Dict[str, DatasetComponent]:

python/lsst/obs/base/ingest.py

@@ -290,7 +290,7 @@ def getDatasetType(self) -> DatasetType:
             "raw",
             ("instrument", "detector", "exposure"),
             "Exposure",
-            universe=self.butler.registry.dimensions,
+            universe=self.butler.dimensions,
         )
 
     # Mypy can not determine that the config passed to super() is this type.
@@ -309,7 +309,7 @@ def __init__(
         config.validate()  # Not a CmdlineTask nor PipelineTask, so have to validate the config here.
         super().__init__(config, **kwargs)
         self.butler = butler
-        self.universe = self.butler.registry.dimensions
+        self.universe = self.butler.dimensions
         self.datasetType = self.getDatasetType()
         self._on_success = on_success
         self._on_metadata_failure = on_metadata_failure
@@ -1230,7 +1230,7 @@ def ingestFiles(
                 datasetTypeName, dimensions, storageClass = raw_definition
                 if not (datasetType := datasetTypes.get(datasetTypeName)):
                     datasetType = DatasetType(
-                        datasetTypeName, dimensions, storageClass, universe=self.butler.registry.dimensions
+                        datasetTypeName, dimensions, storageClass, universe=self.butler.dimensions
                     )
             else:
                 datasetType = self.datasetType

python/lsst/obs/base/instrument_tests.py

@@ -172,7 +172,7 @@ def writeAdditionalCuratedCalibrations(
 
         datasetType = DatasetType(
             "testCalib",
-            universe=butler.registry.dimensions,
+            universe=butler.dimensions,
             isCalibration=True,
             dimensions=("instrument", "detector"),
             storageClass="CuratedCalibration",

python/lsst/obs/base/script/defineVisits.py

@@ -83,7 +83,7 @@ def defineVisits(
     # If this is old schema but is using modern visit grouping algorithm,
     # (which is the default for new code) revert to one-to-one (which
     # was the old default).
-    exposure_dimension = butler.registry.dimensions["exposure"]
+    exposure_dimension = butler.dimensions["exposure"]
     modern = "one-to-one-and-by-counter"
     if "seq_end" not in exposure_dimension.metadata and config.groupExposures.name == modern:
         legacy = "one-to-one"

tests/test_defineVisits.py

@@ -115,7 +115,7 @@ def define_visits_incrementally(self, exposure: DimensionRecord) -> None:
         self.butler.registry.insertDimensionData("exposure", exposure)
         dataIds = [
             DataCoordinate.standardize(
-                instrument="DummyCam", exposure=exposure.id, universe=self.butler.registry.dimensions
+                instrument="DummyCam", exposure=exposure.id, universe=self.butler.dimensions
             )
         ]
         self.task.run(dataIds, incremental=True)

tests/test_ingest.py

@@ -54,12 +54,8 @@ class RawIngestTestCase(IngestTestBase, unittest.TestCase):
     def visits(self):
         butler = Butler(self.root, collections=[self.outputRun])
         return {
-            DataCoordinate.standardize(
-                instrument="DummyCam", visit=100, universe=butler.registry.dimensions
-            ): [
-                DataCoordinate.standardize(
-                    instrument="DummyCam", exposure=100, universe=butler.registry.dimensions
-                )
+            DataCoordinate.standardize(instrument="DummyCam", visit=100, universe=butler.dimensions): [
+                DataCoordinate.standardize(instrument="DummyCam", exposure=100, universe=butler.dimensions)
             ]
         }