Skip to content

Commit

Permalink
Use fits.readMetadata not afwImage.readMetadata
Browse files Browse the repository at this point in the history
It seems that the latter has been deprecated for a while.
  • Loading branch information
timj committed Sep 19, 2019
1 parent 5e42e92 commit 7922e08
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions python/lsst/obs/lsst/gen3/rawFormatter.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

from astro_metadata_translator import fix_header, merge_headers

import lsst.afw.image as afwImage
import lsst.afw.fits
from lsst.obs.base.fitsRawFormatterBase import FitsRawFormatterBase

from .instrument import LsstCamInstrument, LatissInstrument, \
Expand Down Expand Up @@ -55,13 +55,13 @@ def readMetadata(self):
Header metadata.
"""
file = self.fileDescriptor.location.path
phdu = afwImage.readMetadata(file, 0)
phdu = lsst.afw.fits.readMetadata(file, 0)
if "INHERIT" in phdu:
# Trust the inheritance flag
return super().readMetadata()

# Merge ourselves
md = merge_headers([phdu, afwImage.readMetadata(file)],
md = merge_headers([phdu, lsst.afw.fits.readMetadata(file)],
mode="overwrite")
fix_header(md)
return md
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/obs/lsst/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

__all__ = ("readRawFile",)

import lsst.afw.image as afwImage
import lsst.afw.fits
from .lsstCamMapper import assemble_raw
from .assembly import readRawAmps

Expand Down Expand Up @@ -59,7 +59,7 @@ def __init__(self, obj):
amps = readRawAmps(fileName, detector=detector)

component_info = {}
component_info["raw_hdu"] = Info(afwImage.readMetadata(fileName, hdu=0))
component_info["raw_hdu"] = Info(lsst.afw.fits.readMetadata(fileName, hdu=0))
component_info["raw_amp"] = Info(amps)

exp = assemble_raw(dataId, component_info, None)
Expand Down

0 comments on commit 7922e08

Please sign in to comment.