Adapt to daf_butler API changes.

lsst · Nov 12, 2023 · 7ae35f5 · 7ae35f5
1 parent 60239a5
commit 7ae35f5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/python/lsst/ap/verify/ingestion.py b/python/lsst/ap/verify/ingestion.py
@@ -209,7 +209,7 @@ def _defineVisits(self, processes):
         if not exposures:
             raise RuntimeError(f"No exposures defined in {self.workspace.repo}.")
 
-        exposureKeys = list(exposures)[0].graph
+        exposureKeys = list(exposures)[0].dimensions
         exposuresWithVisits = {x.subset(exposureKeys) for x in
                                self.workspace.workButler.registry.queryDataIds(["exposure", "visit"])}
         exposuresNoVisits = exposures - exposuresWithVisits

diff --git a/tests/test_testPipeline.py b/tests/test_testPipeline.py
@@ -97,30 +97,32 @@ def setUpClass(cls):
             {"skymap": SKYMAP, "tract": TRACT, "patch": PATCH, "band": BAND, "subfilter": SUB_FILTER})
         cls.htmId = cls.repo.registry.expandDataId({"htm7": HTM})
 
-        butlerTests.addDatasetType(cls.repo, "postISRCCD", cls.exposureId.keys(), "Exposure")
-        butlerTests.addDatasetType(cls.repo, "icExp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "icSrc", cls.visitId.keys(), "SourceCatalog")
-        butlerTests.addDatasetType(cls.repo, "icExpBackground", cls.visitId.keys(), "Background")
-        butlerTests.addDatasetType(cls.repo, "gaia_dr3_20230707", cls.htmId.keys(), "SimpleCatalog")
-        butlerTests.addDatasetType(cls.repo, "ps1_pv3_3pi_20170110", cls.htmId.keys(), "SimpleCatalog")
-        butlerTests.addDatasetType(cls.repo, "calexp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "src", cls.visitId.keys(), "SourceCatalog")
-        butlerTests.addDatasetType(cls.repo, "calexpBackground", cls.visitId.keys(), "Background")
-        butlerTests.addDatasetType(cls.repo, "srcMatch", cls.visitId.keys(), "Catalog")
-        butlerTests.addDatasetType(cls.repo, "srcMatchFull", cls.visitId.keys(), "Catalog")
+        butlerTests.addDatasetType(cls.repo, "postISRCCD", cls.exposureId.dimensions, "Exposure")
+        butlerTests.addDatasetType(cls.repo, "icExp", cls.visitId.dimensions, "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "icSrc", cls.visitId.dimensions, "SourceCatalog")
+        butlerTests.addDatasetType(cls.repo, "icExpBackground", cls.visitId.dimensions, "Background")
+        butlerTests.addDatasetType(cls.repo, "gaia_dr3_20230707", cls.htmId.dimensions, "SimpleCatalog")
+        butlerTests.addDatasetType(cls.repo, "ps1_pv3_3pi_20170110", cls.htmId.dimensions, "SimpleCatalog")
+        butlerTests.addDatasetType(cls.repo, "calexp", cls.visitId.dimensions, "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "src", cls.visitId.dimensions, "SourceCatalog")
+        butlerTests.addDatasetType(cls.repo, "calexpBackground", cls.visitId.dimensions, "Background")
+        butlerTests.addDatasetType(cls.repo, "srcMatch", cls.visitId.dimensions, "Catalog")
+        butlerTests.addDatasetType(cls.repo, "srcMatchFull", cls.visitId.dimensions, "Catalog")
         butlerTests.addDatasetType(cls.repo, lsst.skymap.BaseSkyMap.SKYMAP_DATASET_TYPE_NAME,
-                                   cls.skymapId.keys(), "SkyMap")
-        butlerTests.addDatasetType(cls.repo, "goodSeeingCoadd", cls.patchId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_differenceExp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_differenceTempExp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_templateExp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "goodSeeingDiff_templateExp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_matchedExp", cls.visitId.keys(), "ExposureF")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_diaSrc", cls.visitId.keys(), "SourceCatalog")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_diaSrcTable", cls.visitId.keys(), "DataFrame")
-        butlerTests.addDatasetType(cls.repo, "visitSsObjects", cls.visitOnlyId.keys(), "DataFrame")
-        butlerTests.addDatasetType(cls.repo, "apdb_marker", cls.visitId.keys(), "Config")
-        butlerTests.addDatasetType(cls.repo, "deepDiff_associDiaSrc", cls.visitId.keys(), "DataFrame")
+                                   cls.skymapId.dimensions, "SkyMap")
+        butlerTests.addDatasetType(cls.repo, "goodSeeingCoadd", cls.patchId.dimensions, "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_differenceExp", cls.visitId.dimensions, "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_differenceTempExp", cls.visitId.dimensions,
+                                   "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_templateExp", cls.visitId.dimensions, "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "goodSeeingDiff_templateExp", cls.visitId.dimensions,
+                                   "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_matchedExp", cls.visitId.dimensions, "ExposureF")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_diaSrc", cls.visitId.dimensions, "SourceCatalog")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_diaSrcTable", cls.visitId.dimensions, "DataFrame")
+        butlerTests.addDatasetType(cls.repo, "visitSsObjects", cls.visitOnlyId.dimensions, "DataFrame")
+        butlerTests.addDatasetType(cls.repo, "apdb_marker", cls.visitId.dimensions, "Config")
+        butlerTests.addDatasetType(cls.repo, "deepDiff_associDiaSrc", cls.visitId.dimensions, "DataFrame")
 
     def setUp(self):
         super().setUp()