Merge pull request #45 from lsst/tickets/DM-16170

DM-16170 re-fix instFlux
lsst-dm · Oct 15, 2018 · e943a47 · e943a47
2 parents 0da0ee1 + ae56a73
commit e943a47
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/python/lsst/meas/mosaic/mosaicTask.py b/python/lsst/meas/mosaic/mosaicTask.py
@@ -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
@@ -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])