Merge pull request #13 from lsst/tickets/DM-24575

DM-24575: Add observational and detector metadata to Registry dimension tables
lsst · Aug 17, 2020 · c1a9f65 · c1a9f65
2 parents f50420e + 331d594
commit c1a9f65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/preloaded/gen3.sqlite3 b/preloaded/gen3.sqlite3
diff --git a/scripts/add_gen3_repo.py b/scripts/add_gen3_repo.py
@@ -115,12 +115,12 @@ def _export_for_copy(dataset, repo):
     butler = daf_butler.Butler(repo)
     with butler.export(directory=dataset.configLocation, format="yaml") as contents:
         # Need all detectors, even those without data, for visit definition
-        contents.saveDataIds(butler.registry.queryDimensions({"detector"}))
+        contents.saveDataIds(butler.registry.queryDataIds({"detector"}).expanded())
         # RepoExport has no safeguards against redundant data
         extraDimensions = set(butler.registry.dimensions.elements).difference(
             {"detector", "instrument", "htm7", "abstract_filter"}
         )
-        contents.saveDatasets(butler.registry.queryDatasets(datasetType=..., collections=..., expand=True),
+        contents.saveDatasets(butler.registry.queryDatasets(datasetType=..., collections=...),
                               elements=extraDimensions)