Skip to content

Commit

Permalink
Change matchMetadata to matchMea
Browse files Browse the repository at this point in the history
Standardize astrometry tasks to return catalog metadata as matchMeta,
not matchMetadata.
  • Loading branch information
r-owen committed Aug 13, 2015
1 parent 0e0f83b commit bb2ad1f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions python/lsst/meas/astrom/anetBasicAstrometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ class InitialAstrometry(object):
sipWcs (Wcs)
sipMatches (MatchList)
refCat (lsst::afw::table::SimpleCatalog)
matchMetadata (PropertyList)
matchMeta (PropertyList)
"""
def __init__(self):
self.tanWcs = None
self.tanMatches = None
self.sipWcs = None
self.sipMatches = None
self.refCat = None
self.matchMetadata = dafBase.PropertyList()
self.matchMeta = dafBase.PropertyList()
self.solveQa = None

def getMatches(self):
Expand Down Expand Up @@ -76,7 +76,7 @@ def getSipMatches(self):
def getTanMatches(self):
return self.tanMatches
def getMatchMetadata(self):
return self.matchMetadata
return self.matchMeta
def getSolveQaMetadata(self):
return self.solveQa

Expand Down Expand Up @@ -348,7 +348,7 @@ def useKnownWcs(self, sourceCat, wcs=None, exposure=None, filterName=None, bbox=
# Here, we make them consistent with the WCS we are returning.
for src in sourceCat:
src.updateCoord(wcs)
astrom.matchMetadata = _createMetadata(bbox, wcs, filterName)
astrom.matchMeta = _createMetadata(bbox, wcs, filterName)
return astrom

def determineWcs(self,
Expand Down
4 changes: 2 additions & 2 deletions tests/SourceMatchJoin.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def testJoin(self):
res = self.getAstrometrySolution()

matches = res.matches
matchmeta = res.matchMetadata
matchmeta = res.matchMeta

normalized = afwTable.packMatches(matches)
normalized.table.setMetadata(matchmeta)
Expand All @@ -71,7 +71,7 @@ def testJoinAllFluxes(self):
res = self.getAstrometrySolution()

matches = res.matches
matchmeta = res.matchMetadata
matchmeta = res.matchMeta

normalized = afwTable.packMatches(matches)
normalized.table.setMetadata(matchmeta)
Expand Down

0 comments on commit bb2ad1f

Please sign in to comment.