Merge pull request #100 from lsst/tickets/DM-15776

DM-15776: Reimplement FitsStorage support for reading headers directly.
lsst-dm · Sep 17, 2018 · b82715d · b82715d
2 parents 10498df + b4e3fb1
commit b82715d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/python/lsst/daf/persistence/posixStorage.py b/python/lsst/daf/persistence/posixStorage.py
@@ -584,6 +584,13 @@ def readFitsStorage(butlerLocation):
         if isinstance(pythonType, basestring):
             pythonType = doImport(pythonType)
     supportsOptions = hasattr(pythonType, "readFitsWithOptions")
+    if not supportsOptions:
+        from lsst.daf.base import PropertySet, PropertyList
+        if issubclass(pythonType, (PropertySet, PropertyList)):
+            from lsst.afw.image import readMetadata
+            reader = readMetadata
+        else:
+            reader = pythonType.readFits
     results = []
     additionalData = butlerLocation.getAdditionalData()
     for locationString in butlerLocation.getLocations():
@@ -597,7 +604,7 @@ def readFitsStorage(butlerLocation):
         if supportsOptions:
             finalItem = pythonType.readFitsWithOptions(logLoc.locString(), options=additionalData)
         else:
-            finalItem = pythonType.readFits(logLoc.locString())
+            finalItem = reader(logLoc.locString())
         results.append(finalItem)
     return results