Merge branch 'tickets/DM-26953' into master

lsst · Oct 2, 2020 · 039d31e · 039d31e
2 parents f56257d + e02bdec
commit 039d31e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/config/export.yaml b/config/export.yaml
@@ -1179,6 +1179,18 @@ data:
   host: null
   timespan_begin: null
   timespan_end: null
+- type: collection
+  collection_type: RUN
+  name: skymaps
+  host: null
+  timespan_begin: null
+  timespan_end: null
+- type: collection
+  collection_type: RUN
+  name: templates/deep
+  host: null
+  timespan_begin: null
+  timespan_end: null
 - type: dataset_type
   name: camera
   dimensions:

diff --git a/preloaded/gen3.sqlite3 b/preloaded/gen3.sqlite3
diff --git a/scripts/add_gen3_repo.py b/scripts/add_gen3_repo.py
@@ -67,6 +67,12 @@ def main():
         _migrate_gen2_to_gen3(dataset, gen2_repo, gen2_calibs, gen3_repo, mode="copy",
                               config_file="convertRepo_copied.py")
 
+    # ap_verify assumes specific collections are present
+    log.info("Adding unpopulated collections...")
+    butler = daf_butler.Butler(gen3_repo, writeable=True)
+    butler.registry.registerCollection("skymaps", daf_butler.CollectionType.RUN)
+    butler.registry.registerCollection("templates/deep", daf_butler.CollectionType.RUN)
+
     log.info("Exporting Gen 3 registry to configure new repos...")
     _export_for_copy(dataset, gen3_repo)
 
@@ -123,6 +129,9 @@ def _export_for_copy(dataset, repo):
         # before ingest.
         for collection in butler.registry.queryCollections(..., collectionTypes={daf_butler.CollectionType.CALIBRATION}):
             contents.saveCollection(collection)
+        # Export empty template collections
+        contents.saveCollection("skymaps")
+        contents.saveCollection("templates/deep")
 
 
 if __name__ == "__main__":