Skip to content

Commit

Permalink
Support persistence of FilterLabel.
Browse files Browse the repository at this point in the history
The Exposure.filter component remains as Filter for API compatibility.
Filter information will be migrated to the FilterLabel class over
DM-27170 and DM-27177, then migrated back to the filter component
over DM-27177 and DM-27811.
  • Loading branch information
kfindeisen committed Dec 5, 2020
1 parent b674850 commit 167374e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions python/lsst/daf/butler/configs/datastores/formatters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -60,5 +61,6 @@ MetricValue:
unsafe_dump: true
BrighterFatterKernel: lsst.daf.butler.formatters.pickle.PickleFormatter
StructuredDataDict: lsst.daf.butler.formatters.yaml.YamlFormatter
# TODO: remove Filter in DM-27177
Filter: lsst.obs.base.formatters.filter.FilterFormatter
Stamps: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
10 changes: 9 additions & 1 deletion python/lsst/daf/butler/configs/storageClasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,13 @@ storageClasses:
pytype: lsst.meas.algorithms.Curve
CrosstalkCalib:
pytype: lsst.ip.isr.CrosstalkCalib
# TODO: remove Filter in DM-27177
Filter:
pytype: lsst.afw.image.Filter
FilterLabel:
pytype: lsst.afw.image.FilterLabel
# To support exposure.filter; remove in DM-27177
delegate: lsst.obs.base.formatters.filter.FilterTranslator
Exposure:
pytype: lsst.afw.image.Exposure
delegate: lsst.obs.base.exposureAssembler.ExposureAssembler
Expand All @@ -123,13 +128,16 @@ storageClasses:
coaddInputs: CoaddInputs
transmissionCurve: TransmissionCurve
metadata: PropertyList
filter: Filter
# TODO: for consistency with Exposure.getFilterLabel(). Deprecate in DM-27177, remove in DM-27811.
filterLabel: FilterLabel
detector: Detector
validPolygon: Polygon
derivedComponents:
bbox: Box2I
dimensions: Extent2I
xy0: Point2I
# TODO: change filter to FilterLabel and make non-derived in DM-27177. This is a breaking change.
filter: Filter
ExposureF:
inheritsFrom: Exposure
pytype: lsst.afw.image.ExposureF
Expand Down

0 comments on commit 167374e

Please sign in to comment.