Merge branch 'tickets/DM-24555'

lsst · Apr 23, 2020 · 6d49846 · 6d49846
2 parents 0d955ba + 0b44122
commit 6d49846
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/python/lsst/daf/butler/formatters/fitsExposureFormatter.py b/python/lsst/daf/butler/formatters/fitsExposureFormatter.py
@@ -103,6 +103,18 @@ def readComponent(self, component, parameters=None):
                         'image': ('readImage', True),
                         'mask': ('readMask', True),
                         'variance': ('readVariance', True),
+                        'photoCalib': ('readPhotoCalib', False),
+                        'bbox': ('readBBox', True),
+                        'xy0': ('readXY0', True),
+                        'metadata': ('readMetadata', False),
+                        'filter': ('readFilter', False),
+                        'polygon': ('readValidPolygon', False),
+                        'appCorrMap': ('readApCorrMap', False),
+                        'visitInfo': ('readVisitInfo', False),
+                        'transmissionCurve': ('readTransmissionCurve', False),
+                        'detector': ('readDetector', False),
+                        'extras': ('readExtraComponents', False),
+                        'exposureInfo': ('readExposureInfo', False),
                         }
         method, hasParams = componentMap.get(component, None)
 

diff --git a/tests/test_datastoreFits.py b/tests/test_datastoreFits.py
@@ -176,7 +176,12 @@ def testExposurePutGet(self):
         self.assertEqual(type(exposure), type(exposureOut))
 
         # Get some components
-        for compName in ("wcs", "image", "mask", "coaddInputs", "psf"):
+        # Could not test the following components as they were not known:
+        # bbox, xy0, filter, polygon, appCorrMap, detector,
+        # extras, and exposureInfo
+        # transmissionCurve returned None and which is fixed in DM-24347
+        for compName in ("wcs", "image", "mask", "coaddInputs", "psf",
+                         "variance", "photoCalib", "metadata", "visitInfo"):
             compRef = self.makeDatasetRef(ref.datasetType.componentTypeName(compName), dimensions,
                                           storageClass.components[compName], dataId, id=ref.id)
             component = datastore.get(compRef)