Merge pull request #158 from lsst/tickets/DM-27251

DM-27251: update to daf_butler API and configuration changes
lsst · Oct 30, 2020 · 5395043 · 5395043
2 parents 8900aa8 + 54955ad
commit 5395043
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/python/lsst/pipe/base/graphBuilder.py b/python/lsst/pipe/base/graphBuilder.py
@@ -490,8 +490,10 @@ def connectDataIds(self, registry, collections, userQuery):
         ----------
         registry : `lsst.daf.butler.Registry`
             Registry for the data repository; used for all data ID queries.
-        collections : `lsst.daf.butler.CollectionSearch`
-            Object representing the collections to search for input datasets.
+        collections
+            Expressions representing the collections to search for input
+            datasets.  May be any of the types accepted by
+            `lsst.daf.butler.CollectionSearch.fromExpression`.
         userQuery : `str`, optional
             User-provided expression to limit the data IDs processed.
 
@@ -578,8 +580,10 @@ def resolveDatasetRefs(self, registry, collections, run, commonDataIds, *, skipE
         ----------
         registry : `lsst.daf.butler.Registry`
             Registry for the data repository; used for all data ID queries.
-        collections : `lsst.daf.butler.CollectionSearch`
-            Object representing the collections to search for input datasets.
+        collections
+            Expressions representing the collections to search for input
+            datasets.  May be any of the types accepted by
+            `lsst.daf.butler.CollectionSearch.fromExpression`.
         run : `str`, optional
             Name of the `~lsst.daf.butler.CollectionType.RUN` collection for
             output datasets, if it already exists.
@@ -893,8 +897,10 @@ def makeGraph(self, pipeline, collections, run, userQuery):
         ----------
         pipeline : `Pipeline`
             Pipeline definition, task names/classes and their configs.
-        collections : `lsst.daf.butler.CollectionSearch`
-            Object representing the collections to search for input datasets.
+        collections
+            Expressions representing the collections to search for input
+            datasets.  May be any of the types accepted by
+            `lsst.daf.butler.CollectionSearch.fromExpression`.
         run : `str`, optional
             Name of the `~lsst.daf.butler.CollectionType.RUN` collection for
             output datasets, if it already exists.

diff --git a/python/lsst/pipe/base/tests/simpleQGraph.py b/python/lsst/pipe/base/tests/simpleQGraph.py
@@ -28,7 +28,7 @@
 import logging
 import numpy
 
-from lsst.daf.butler import (Butler, Config, DatasetType, CollectionSearch)
+from lsst.daf.butler import Butler, Config, DatasetType
 import lsst.daf.butler.tests as butlerTests
 import lsst.pex.config as pexConfig
 from ... import base as pipeBase
@@ -268,7 +268,7 @@ def makeSimpleQGraph(nQuanta=5, pipeline=None, butler=None, root=None, skipExist
     builder = pipeBase.GraphBuilder(registry=butler.registry, skipExisting=skipExisting)
     qgraph = builder.makeGraph(
         pipeline,
-        collections=CollectionSearch.fromExpression(butler.run),
+        collections=[butler.run],
         run=butler.run,
         userQuery=userQuery
     )

diff --git a/tests/test_quantumGraph.py b/tests/test_quantumGraph.py
@@ -125,12 +125,18 @@ def setUp(self):
                         "name": "id",
                         "type": "int",
                     }],
+                    "storage": {
+                        "cls": "lsst.daf.butler.registry.dimensions.table.TableDimensionRecordStorage",
+                    },
                 },
                 "B": {
                     "keys": [{
                         "name": "id",
                         "type": "int",
                     }],
+                    "storage": {
+                        "cls": "lsst.daf.butler.registry.dimensions.table.TableDimensionRecordStorage",
+                    },
                 }
             },
             "packers": {}