The obs_base formatters have been moved to use a formatters dir

lsst · Jun 12, 2020 · 1f57588 · 1f57588
1 parent 09fb8f8
commit 1f57588
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/config/datastores/formatters.yaml b/config/datastores/formatters.yaml
@@ -2,39 +2,39 @@
 # `lsst.daf.butler.Formatter` that handles it.
 write_recipes: !include writeRecipes.yaml
 default:
-  lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter:
+  lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter:
     # default is the default recipe regardless but this demonstrates
     # how to specify a default write parameter
     recipe: default
-TablePersistable: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-Wcs: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-Psf: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-CoaddInputs: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-VisitInfo: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-ApCorr: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-PhotoCalib: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-TransmissionCurve: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-Camera: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-Detector: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-Catalog: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-PeakCatalog: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-SimpleCatalog: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-SourceCatalog: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
+TablePersistable: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+Wcs: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+Psf: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+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
+TransmissionCurve: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+Camera: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+Detector: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+Catalog: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+PeakCatalog: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+SimpleCatalog: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+SourceCatalog: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 ObjectMaskCatalog: lsst.pipe.tasks.objectMasks.RegionFileFormatter
 DataFrame: lsst.daf.butler.formatters.parquet.ParquetFormatter
-Defects: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-QECurve: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-CrosstalkCalib: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
-ImageF: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-ImageU: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-DecoratedImageU: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-MaskX: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-MaskedImageF: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-Exposure: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-ExposureF: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
-ExposureI: lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter
+Defects: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+QECurve: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+CrosstalkCalib: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
+ImageF: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+ImageU: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+DecoratedImageU: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+MaskX: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+MaskedImageF: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+Exposure: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+ExposureF: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
+ExposureI: lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter
 SkyMap: lsst.daf.butler.formatters.pickle.PickleFormatter
-Background: lsst.obs.base.fitsGenericFormatter.FitsGenericFormatter
+Background: lsst.obs.base.formatters.fitsGeneric.FitsGenericFormatter
 Config: lsst.daf.butler.formatters.pexConfig.PexConfigFormatter
 Packages: lsst.daf.butler.formatters.pickle.PickleFormatter
 PropertyList: lsst.daf.butler.formatters.yaml.YamlFormatter

diff --git a/config/datastores/writeRecipes.yaml b/config/datastores/writeRecipes.yaml
@@ -1,4 +1,4 @@
-lsst.obs.base.fitsExposureFormatter.FitsExposureFormatter:
+lsst.obs.base.formatters.fitsExposure.FitsExposureFormatter:
   # No compression
   noCompression: &noCompression
     image: &noCompressionOptions

diff --git a/python/lsst/daf/butler/core/formatter.py b/python/lsst/daf/butler/core/formatter.py
@@ -453,7 +453,7 @@ def registerFormatters(self, config: Config, *, universe: DimensionUniverse) ->
 
            formatters:
              write_recipes:
-               lsst.obs.base.fitsExposureFormatter.FixExposureFormatter:
+               lsst.obs.base.formatters.fitsExposure.FixExposureFormatter:
                  lossless:
                    ...
                  noCompression: