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-16170 re-fix instFlux #45

Merged
merged 1 commit into from
Oct 15, 2018
Merged

DM-16170 re-fix instFlux #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions python/lsst/meas/mosaic/mosaicTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ def readSrc(self, dataRef):
aliasMap.set(lsstName, otherName)

if hscRun is not None:
for slot in ("PsfFlux", "ModelFlux", "ApFlux", "InstFlux", "Centroid", "Shape"):
for slot in ("PsfFlux", "ModelFlux", "ApFlux", "GaussianFlux", "Centroid", "Shape"):
getattr(matches[0][1].getTable(), "define" + slot)(
getattr(sources, "get" + slot + "Definition")())
# For some reason, the CalibFlux slot in sources is coming up as centroid_sdss, so
Expand All @@ -381,10 +381,10 @@ def readSrc(self, dataRef):
newMatch = table.makeRecord()
newMatch.assign(match[0], mapper)
match[0] = newMatch
primaryFluxKey = refSchema.find(refSchema.join(self.cterm.primary, "instFlux")).key
secondaryFluxKey = refSchema.find(refSchema.join(self.cterm.secondary, "instFlux")).key
primaryFluxErrKey = refSchema.find(refSchema.join(self.cterm.primary, "instFluxErr")).key
secondaryFluxErrKey = refSchema.find(refSchema.join(self.cterm.secondary, "instFluxErr")).key
primaryFluxKey = refSchema.find(refSchema.join(self.cterm.primary, "flux")).key
secondaryFluxKey = refSchema.find(refSchema.join(self.cterm.secondary, "flux")).key
primaryFluxErrKey = refSchema.find(refSchema.join(self.cterm.primary, "fluxErr")).key
secondaryFluxErrKey = refSchema.find(refSchema.join(self.cterm.secondary, "fluxErr")).key
refFlux1 = numpy.array([m[0].get(primaryFluxKey) for m in matches])
refFlux2 = numpy.array([m[0].get(secondaryFluxKey) for m in matches])
refFluxErr1 = numpy.array([m[0].get(primaryFluxErrKey) for m in matches])
Expand Down