Use FilterLabel to persist Filter component of Exposure.

This change makes it easier to support ExposureInfo v2. Code in afw takes care of backward-compatibility with older Exposure files.
lsst · Nov 26, 2020 · 0d111f8 · 0d111f8
1 parent a61a244
commit 0d111f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/python/lsst/daf/butler/configs/datastores/formatters.yaml b/python/lsst/daf/butler/configs/datastores/formatters.yaml
@@ -13,6 +13,7 @@ CoaddInputs: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 VisitInfo: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 ApCorr: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 PhotoCalib: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+FilterLabel: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 TransmissionCurve: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 Camera: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 Detector: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter

diff --git a/python/lsst/daf/butler/configs/storageClasses.yaml b/python/lsst/daf/butler/configs/storageClasses.yaml
@@ -105,6 +105,8 @@ storageClasses:
     pytype: lsst.ip.isr.CrosstalkCalib
   Filter:
     pytype: lsst.afw.image.Filter
+  FilterLabel:
+    pytype: lsst.afw.image.FilterLabel
   Exposure:
     pytype: lsst.afw.image.Exposure
     delegate: lsst.obs.base.exposureAssembler.ExposureAssembler
@@ -123,7 +125,7 @@ storageClasses:
       coaddInputs: CoaddInputs
       transmissionCurve: TransmissionCurve
       metadata: PropertyList
-      filter: Filter
+      filter: FilterLabel
       detector: Detector
       validPolygon: Polygon
     derivedComponents: