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-14842: Fix deprecation warnings from PropertyList/Set.get #71

Merged
merged 2 commits into from
Jun 22, 2018
Merged

DM-14842: Fix deprecation warnings from PropertyList/Set.get #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a16db12
Use getScalar and getArray instead of get
r-owen Jun 19, 2018
410d984
git hide .coverage
r-owen Jun 19, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ config.log
.cache/
.pytest_cache/
pytest_session.txt
.coverage
doc/html
doc/*.tag
doc/*.inc
Expand Down
4 changes: 2 additions & 2 deletions bin.src/genInputRegistry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ def processRaft(raftDir, conn, done):
continue

md = readMetadata(fits)
expTime = md.get("EXPTIME")
mjdObs = md.get("MJD-OBS")
expTime = md.getScalar("EXPTIME")
mjdObs = md.getScalar("MJD-OBS")
taiObs = dafBase.DateTime(mjdObs, dafBase.DateTime.MJD,
dafBase.DateTime.TAI).toString(dafBase.DateTime.UTC)[:-1]
conn.execute("""INSERT INTO raw VALUES
Expand Down
12 changes: 6 additions & 6 deletions python/lsst/obs/lsstSim/ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@ def run(self, args):
class SimParseTask(ParseTask):

def translate_ccd(self, md):
sensor_str = md.get('CHIPID')
sensor_str = md.getScalar('CHIPID')
return ",".join(sensor_str[-2:])

def translate_sensor(self, md):
sensor_str = md.get('CHIPID')
sensor_str = md.getScalar('CHIPID')
return ",".join(sensor_str[-2:])

def translate_raft(self, md):
sensor_str = md.get('CHIPID')
sensor_str = md.getScalar('CHIPID')
return ",".join(sensor_str[1:3])

def translate_taiobs(self, md):
import lsst.daf.base as dafBase
return dafBase.DateTime(md.get('MJD-OBS'), dafBase.DateTime.MJD,
return dafBase.DateTime(md.getScalar('MJD-OBS'), dafBase.DateTime.MJD,
dafBase.DateTime.TAI).toString(dafBase.DateTime.UTC)[:-1]

def translate_channel(self, md):
if 'AMPID' in md.names():
amp_str = md.get('AMPID')
amp_str = md.getScalar('AMPID')
return ",".join(amp_str[-2:])
else:
# Must be processing an eimage so return nominal amp
Expand All @@ -69,7 +69,7 @@ def translate_channel(self, md):
def translate_snap(self, md):
# HACK XXX this is just to work around the fact that we don't have
# the correct header cards in the galsim images.
filename_str = md.get('OUTFILE')
filename_str = md.getScalar('OUTFILE')
if filename_str.endswith('fits'):
return int(filename_str[-8:-5])
else:
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/obs/lsstSim/lsstSimMapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def std_raw(self, item, dataId):
md = item.getMetadata()
if md.exists("VERSION") and md.getInt("VERSION") < 16952:
# CRVAL is FK5 at date of observation
dateObsTaiMjd = md.get("TAI")
dateObsTaiMjd = md.getScalar("TAI")
dateObs = dafBase.DateTime(dateObsTaiMjd,
system=dafBase.DateTime.MJD,
scale=dafBase.DateTime.TAI)
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/obs/lsstSim/processCalibLsstSim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ def copyMetadata(self, exposure, metadata, calibType):
outmetadata = exposure.getMetadata()
cardsToCopy = ['CREATOR', 'VERSION', 'BRANCH', 'DATE', 'CCDID']
for card in cardsToCopy:
outmetadata.add(card, metadata.get(card))
outmetadata.add('ID', outmetadata.get('CCDID'))
outmetadata.add(card, metadata.getScalar(card))
outmetadata.add('ID', outmetadata.getScalar('CCDID'))

def fixDefectsAndSat(self, masterFrame, detector):
fwhm = self.config.fwhm
Expand Down
6 changes: 3 additions & 3 deletions tests/test_getMD.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ def testRawMetadata(self):
"""Test retrieval of raw image metadata"""
rawMd = self.butler.get("raw_md", visit=85471048, snap=0, raft='0,3',
sensor='0,1', channel='1,0', immediate=True)
self.assertAlmostEqual(rawMd.get("AIRMASS"), 1.3184949200550, places=11)
self.assertEqual(rawMd.get("BITPIX"), 16)
self.assertEqual(rawMd.get("CCDID"), "R03_S01_C10")
self.assertAlmostEqual(rawMd.getScalar("AIRMASS"), 1.3184949200550, places=11)
self.assertEqual(rawMd.getScalar("BITPIX"), 16)
self.assertEqual(rawMd.getScalar("CCDID"), "R03_S01_C10")


class MemoryTester(lsst.utils.tests.MemoryTestCase):
Expand Down
3 changes: 2 additions & 1 deletion tests/test_lsstSimIsrTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ def testRun(self):
camera = self.ampRef.get("camera")
isrData = lsstIsrTask.readIsrData(self.ampRef, ampExp)
postIsrExp = lsstIsrTask.run(ampExp, camera=camera, **isrData.getDict()).exposure
self.assertAlmostEqual(ampExp.getMetadata().get('GAIN'), postIsrExp.getMetadata().get('GAIN'))
self.assertAlmostEqual(ampExp.getMetadata().getScalar('GAIN'),
postIsrExp.getMetadata().getScalar('GAIN'))
self.assertAlmostEqual(ampExp.getDimensions()[0], postIsrExp.getDimensions()[0])
self.assertAlmostEqual(ampExp.getDimensions()[1], postIsrExp.getDimensions()[1])
self.assertAlmostEqual(afwMath.makeStatistics(postIsrExp.getMaskedImage(), afwMath.MEAN).getValue(),
Expand Down