Simplify FITS I/O for "FitsStorage"

Simplify FITS I/O for "FitsStorage" by calling new methods
readFitsWithOptions or writeFitsWithOptions on those objects.
instead of using boost persistence.

python/lsst/daf/persistence/posixStorage.py

@@ -563,7 +563,61 @@ def writeConfigStorage(butlerLocation, obj):
 
 
 def readFitsStorage(butlerLocation):
-    """Read a FITS image from a butlerLocation.
+    """Read objects from a FITS file specified by ButlerLocation.
+
+    The class to be read must have a class method or static method
+    ``readFitsWithOptions(path, options)`` where options is
+    the data returned by ``butlerLocation.getAdditionalData()``
+
+    Parameters
+    ----------
+    butlerLocation : ButlerLocation
+        The location for the object(s) to be read.
+
+    Returns
+    -------
+    A list of objects as described by the butler location. One item for
+    each location in butlerLocation.getLocations()
+    """
+    pythonType = butlerLocation.getPythonType()
+    if pythonType is not None:
+        if isinstance(pythonType, basestring):
+            pythonType = doImport(pythonType)
+    results = []
+    additionalData = butlerLocation.getAdditionalData()
+    for locationString in butlerLocation.getLocations():
+        locStringWithRoot = os.path.join(butlerLocation.getStorage().root, locationString)
+        logLoc = LogicalLocation(locStringWithRoot, additionalData)
+        if not os.path.exists(logLoc.locString()):
+            raise RuntimeError("No such FITS file: " + logLoc.locString())
+        finalItem = pythonType.readFitsWithOptions(logLoc.locString(), options=additionalData)
+        results.append(finalItem)
+    return results
+
+
+def writeFitsStorage(butlerLocation, obj):
+    """Writes an object to a FITS file specified by ButlerLocation.
+
+    The object to be written must have a method
+    ``writeFitsWithOptions(path, options)`` where options is
+    the data returned by ``butlerLocation.getAdditionalData()``
+
+    Parameters
+    ----------
+    butlerLocation : ButlerLocation
+        The location for the object to be written.
+    obj : object instance
+        The object to be written.
+    """
+    additionalData = butlerLocation.getAdditionalData()
+    locations = butlerLocation.getLocations()
+    with SafeFilename(os.path.join(butlerLocation.getStorage().root, locations[0])) as locationString:
+        logLoc = LogicalLocation(locationString, additionalData)
+        obj.writeFitsWithOptions(logLoc.locString(), options=additionalData)
+
+
+def boostReadFitsStorage(butlerLocation):
+    """Read a FITS image from a butlerLocation using boost peristence
 
     Parameters
     ----------
@@ -589,8 +643,9 @@ def readFitsStorage(butlerLocation):
     return results
 
 
-def writeFitsStorage(butlerLocation, obj):
-    """Writes an object to a FITS file specified by ButlerLocation.
+def boostWriteFitsStorage(butlerLocation, obj):
+    """Writes an object to a FITS file specified by ButlerLocation
+    using boost peristence
 
     Parameters
     ----------
@@ -954,7 +1009,7 @@ def writeBoostStorage(butlerLocation, obj):
 PosixStorage.registerFormatters("MatplotlibStorage", readMatplotlibStorage, writeMatplotlibStorage)
 PosixStorage.registerFormatters("PafStorage", readFormatter=readPafStorage)
 PosixStorage.registerFormatters("YamlStorage", readYamlStorage, writeYamlStorage)
-PosixStorage.registerFormatters("BoostStorage", readFitsStorage, writeFitsStorage)
+PosixStorage.registerFormatters("BoostStorage", boostReadFitsStorage, boostWriteFitsStorage)
 
 Storage.registerStorageClass(scheme='', cls=PosixStorage)
 Storage.registerStorageClass(scheme='file', cls=PosixStorage)