Merge pull request #67 from lsst/tickets/DM-15887

Use delayed StorageClass instantiation (DM-15887)
lsst · Nov 13, 2018 · e6a35c8 · e6a35c8
2 parents b461e1a + 17f9e8a
commit e6a35c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/python/lsst/pipe/base/pipelineTask.py b/python/lsst/pipe/base/pipelineTask.py
@@ -24,7 +24,7 @@
 
 __all__ = ["DatasetTypeDescriptor", "PipelineTask"]  # Classes in this module
 
-from lsst.daf.butler import DatasetType, StorageClassFactory
+from lsst.daf.butler import DatasetType
 from .config import (InputDatasetConfig, OutputDatasetConfig,
                      InitInputDatasetConfig, InitOutputDatasetConfig)
 from .task import Task
@@ -79,12 +79,9 @@ def fromConfig(cls, datasetConfig):
         -------
         descriptor : `DatasetTypeDescriptor`
         """
-        # map storage class name to storage class
-        storageClass = StorageClassFactory().getStorageClass(datasetConfig.storageClass)
-
         datasetType = DatasetType(name=datasetConfig.name,
                                   dataUnits=datasetConfig.units,
-                                  storageClass=storageClass)
+                                  storageClass=datasetConfig.storageClass)
         # Use scalar=True for Init dataset types
         scalar = getattr(datasetConfig, 'scalar', True)
         return cls(datasetType=datasetType, scalar=scalar)

diff --git a/tests/test_pipelineTask.py b/tests/test_pipelineTask.py
@@ -25,8 +25,7 @@
 import unittest
 
 import lsst.utils.tests
-from lsst.daf.butler import (DatasetRef, DatasetType, Quantum, Run,
-                             StorageClass, StorageClassFactory)
+from lsst.daf.butler import DatasetRef, DatasetType, Quantum, Run
 import lsst.pex.config as pexConfig
 import lsst.pipe.base as pipeBase
 
@@ -51,15 +50,13 @@ def get(self, datasetRefOrType, dataId=None):
         else:
             dsTypeName = datasetRefOrType
         key = self.key(dataId)
-#         print("butler.get: name={} key={}".format(ref.datasetType.name, key))
         dsdata = self.datasets.get(dsTypeName)
         if dsdata:
             return dsdata.get(key)
         return None
 
     def put(self, inMemoryDataset, dsTypeName, dataId, producer=None):
         key = self.key(dataId)
-#         print("butler.put: {} -> name={} key={}".format(inMemoryDataset, ref.datasetType.name, key))
         dsdata = self.datasets.setdefault(dsTypeName, {})
         dsdata[key] = inMemoryDataset
 
@@ -109,17 +106,12 @@ class DatasetTypeDescriptorTestCase(unittest.TestCase):
     """A test case for DatasetTypeDescriptor
     """
 
-    @classmethod
-    def setUpClass(cls):
-        StorageClassFactory().registerStorageClass(StorageClass("example"))
-
     def testConstructor(self):
         """Test DatasetTypeDescriptor init
         """
-        storageClass = StorageClassFactory().getStorageClass("example")
         datasetType = DatasetType(name="testDataset",
                                   dataUnits=["UnitA"],
-                                  storageClass=storageClass)
+                                  storageClass="example")
         descriptor = pipeBase.DatasetTypeDescriptor(datasetType=datasetType,
                                                     scalar=False)
         self.assertIs(descriptor.datasetType, datasetType)
@@ -149,10 +141,6 @@ class PipelineTaskTestCase(unittest.TestCase):
     """A test case for PipelineTask
     """
 
-    @classmethod
-    def setUpClass(cls):
-        StorageClassFactory().registerStorageClass(StorageClass("example"))
-
     def _makeDSRefVisit(self, dstype, visitId):
         return DatasetRef(datasetType=dstype,
                           dataId=dict(camera="X",