Cleanups to versioning in the metadata

lsst · Apr 5, 2019 · 165f6c3 · 165f6c3
1 parent e0ee27f
commit 165f6c3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/bin.src/convert_refcat_to_nJy.py b/bin.src/convert_refcat_to_nJy.py
@@ -47,6 +47,7 @@
 import lsst.afw.table
 from lsst.meas.algorithms import DatasetConfig
 from lsst.meas.algorithms.loadReferenceObjects import convertToNanojansky, hasNanojanskyFluxUnits
+from lsst.meas.algorithms.ingestIndexReferenceTask import addRefCatMetadata
 import lsst.log
 
 
@@ -78,6 +79,7 @@ def process_one(filename, write=False, quiet=False):
     output = convertToNanojansky(catalog, log, doConvert=write)
 
     if write:
+        addRefCatMetadata(output)
         output.writeFits(filename)
         log.info(f"Wrote: {filename}")
 

diff --git a/python/lsst/meas/algorithms/ingestIndexReferenceTask.py b/python/lsst/meas/algorithms/ingestIndexReferenceTask.py
@@ -51,11 +51,13 @@ def addRefCatMetadata(catalog):
 
     Parameters
     ----------
-    catalog - `~lsst.afw.table.SimpleCatalog`
+    catalog : `lsst.afw.table.SimpleCatalog`
         Catalog to which metadata should be attached.  Will be modified
         in-place.
     """
-    md = PropertyList()
+    md = catalog.getMetadata()
+    if md is None:
+        md = PropertyList()
     md.set("REFCAT_FORMAT_VERSION", LATEST_FORMAT_VERSION)
     catalog.setMetadata(md)
 

diff --git a/python/lsst/meas/algorithms/loadIndexedReferenceObjects.py b/python/lsst/meas/algorithms/loadIndexedReferenceObjects.py
@@ -97,8 +97,8 @@ def loadSkyCircle(self, ctrCoord, radius, filterName=None, epoch=None):
             # too, and should be consistent with the version in the config.
             catVersion = getFormatVersionFromRefCat(refCat)
             if catVersion != self.dataset_config.format_version:
-                raise RuntimeError(f"Format version in reference catalog ({catVersion}) does "
-                                   f"not match configuration ({self.dataset_config.format_version})")
+                raise RuntimeError(f"Format version in reference catalog ({catVersion}) does not match"
+                                   f" format_version field in config ({self.dataset_config.format_version})")
 
         self._addFluxAliases(refCat.schema)
         fluxField = getRefFluxField(schema=refCat.schema, filterName=filterName)

diff --git a/python/lsst/meas/algorithms/loadReferenceObjects.py b/python/lsst/meas/algorithms/loadReferenceObjects.py
@@ -136,10 +136,8 @@ def convertToNanojansky(catalog, log, doConvert=True):
     fluxFieldsStr = '; '.join("(%s, '%s')" % (field.getName(), field.getUnits()) for field in input_fields)
 
     if doConvert:
-        from .ingestIndexReferenceTask import addRefCatMetadata  # workaround for circular dependency
         newSchema = mapper.getOutputSchema()
         output = lsst.afw.table.SimpleCatalog(newSchema)
-        addRefCatMetadata(output)
         output.extend(catalog, mapper=mapper)
         for field in output_fields:
             output[field.getName()] *= 1e9