Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-20812: Drop TablePersistable from storage class names #174

Merged
merged 1 commit into from
Jul 29, 2019
Merged

DM-20812: Drop TablePersistable from storage class names #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions config/datastores/posixDatastore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ datastore:
default: "{collection}/{datasetType}.{component:?}/{tract:?}/{patch:?}/{label:?}/{abstract_filter:?}/{physical_filter:?}/{visit:?}/{datasetType}_{component:?}_{tract:?}_{patch:?}_{label:?}_{abstract_filter:?}_{physical_filter:?}_{calibration_label:?}_{visit:?}_{exposure:?}_{detector:?}_{instrument:?}_{skymap:?}_{skypix:?}_{run}"
formatters:
TablePersistable: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistableWcs: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistablePsf: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistableCoaddInputs: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistableVisitInfo: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistableApCorr: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistablePhotoCalib: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistableTransmissionCurve: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TablePersistableCamera: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
Wcs: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
Psf: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
CoaddInputs: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
VisitInfo: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
ApCorr: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
PhotoCalib: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
TransmissionCurve: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
Camera: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
ImageF: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
MaskX: lsst.daf.butler.formatters.fitsCatalogFormatter.FitsCatalogFormatter
Exposure: lsst.daf.butler.formatters.fitsExposureFormatter.FitsExposureFormatter
Expand Down
2 changes: 1 addition & 1 deletion config/gen2convert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ storageClasses:
# StorageClass names themselves.
BaseSkyMap: SkyMap
BaseCatalog: Catalog
TransmissionCurve: TablePersistableTransmissionCurve
TransmissionCurve: TransmissionCurve
BackgroundList: Background
Config: Config
raw: Exposure
Expand Down
30 changes: 15 additions & 15 deletions config/storageClasses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ storageClasses:
pytype: list
TablePersistable:
pytype: lsst.afw.table.io.Persistable
TablePersistableWcs:
Wcs:
pytype: lsst.afw.geom.skyWcs.SkyWcs
TablePersistablePsf:
Psf:
pytype: lsst.afw.detection.Psf
TablePersistableCoaddInputs:
CoaddInputs:
pytype: lsst.afw.image.CoaddInputs
TablePersistableVisitInfo:
VisitInfo:
pytype: lsst.afw.image.VisitInfo
TablePersistableApCorr:
ApCorr:
pytype: lsst.afw.image.ApCorrMap
TablePersistablePhotoCalib:
PhotoCalib:
pytype: lsst.afw.image.PhotoCalib
TablePersistableTransmissionCurve:
TransmissionCurve:
pytype: lsst.afw.image.TransmissionCurve
TablePersistableCamera:
Camera:
pytype: lsst.afw.cameraGeom.Camera
Image: &Image
pytype: lsst.afw.image.Image
Expand Down Expand Up @@ -91,13 +91,13 @@ storageClasses:
image: Image
mask: Mask
variance: Image
wcs: TablePersistableWcs
psf: TablePersistablePsf
photoCalib: TablePersistablePhotoCalib
visitInfo: TablePersistableVisitInfo
apCorrMap: TablePersistableApCorr
coaddInputs: TablePersistableCoaddInputs
transmissionCurve: TablePersistableTransmissionCurve
wcs: Wcs
psf: Psf
photoCalib: PhotoCalib
visitInfo: VisitInfo
apCorrMap: ApCorr
coaddInputs: CoaddInputs
transmissionCurve: TransmissionCurve
metadata: PropertyList
ExposureF:
inheritsFrom: Exposure
Expand Down