Merge pull request #174 from lsst/tickets/DM-20812

DM-20812: Drop TablePersistable from storage class names
lsst · Jul 29, 2019 · 6c432d5 · 6c432d5
2 parents 7220349 + a668742
commit 6c432d5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/config/datastores/posixDatastore.yaml b/config/datastores/posixDatastore.yaml
@@ -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

diff --git a/config/gen2convert.yaml b/config/gen2convert.yaml
@@ -67,7 +67,7 @@ storageClasses:
   # StorageClass names themselves.
   BaseSkyMap: SkyMap
   BaseCatalog: Catalog
-  TransmissionCurve: TablePersistableTransmissionCurve
+  TransmissionCurve: TransmissionCurve
   BackgroundList: Background
   Config: Config
   raw: Exposure

diff --git a/config/storageClasses.yaml b/config/storageClasses.yaml
@@ -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
@@ -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