Removed Version0FlagMapper -- but still uses version 0 ref table

lsst · Mar 14, 2015 · ae89fd5 · ae89fd5
1 parent 85c615b
commit ae89fd5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/python/lsst/meas/astrom/catalogStarSelector.py b/python/lsst/meas/astrom/catalogStarSelector.py
@@ -33,7 +33,6 @@
 import lsst.afw.geom.ellipses as geomEllip
 import lsst.afw.cameraGeom as cameraGeom
 import lsst.meas.algorithms as measAlg
-from lsst.meas.base import Version0FlagMapper
 
 class CatalogStarSelectorConfig(pexConfig.Config):
     fluxLim = pexConfig.Field(
@@ -140,10 +139,7 @@ def selectStars(self, exposure, sources, matches=None):
         imageSize = exposure.getDimensions()
         filterName = exposure.getFilter().getName()
         calib = exposure.getCalib()
-        if sources.getVersion() == 0:
-            isGoodSource = CheckSource(sources, self._fluxLim, self._fluxMax, Version0FlagMapper(self._badStarPixelFlags))
-        else: 
-            isGoodSource = CheckSource(sources, self._fluxLim, self._fluxMax, self._badStarPixelFlags)
+        isGoodSource = CheckSource(sources, self._fluxLim, self._fluxMax, self._badStarPixelFlags)
 
         #
         # Go through and find all the PSFs in the catalogue

diff --git a/python/lsst/meas/photocal/PhotoCal.py b/python/lsst/meas/photocal/PhotoCal.py
@@ -33,7 +33,6 @@
 import lsst.afw.table as afwTable
 from lsst.afw.image import abMagFromFlux, abMagErrFromFluxErr, fluxFromABMag, Calib
 import lsst.afw.display.ds9 as ds9
-from lsst.meas.base.base import Version0FlagMapper
 from lsst.meas.algorithms import getRefFluxField
 
 def checkSourceFlags(source, sourceKeys):
@@ -244,17 +243,19 @@ def getSourceKeys(self, schema):
         - badFlags: a list of keys for field names in self.config.badFlags
         """
         fluxField = self.config.fluxField
+        goodFlags = [schema.find(name).key for name in self.config.goodFlags]
         if schema.getVersion() == 0:
             if fluxField == 'base_PsfFlux_flux': fluxField = "flux.psf"
             flux = schema.find(fluxField).key
             fluxErr = schema.find(fluxField + ".err").key
-            goodFlags = [schema.find(name).key for name in Version0FlagMapper(self.config.goodFlags)]
-            badFlags = [schema.find(name).key for name in Version0FlagMapper(self.config.badFlags)]
+            version0BadFlags=["flags.pixel.edge", "flags.pixel.interpolated.any",
+                "flags.pixel.saturated.any"]
+            badFlags = [schema.find(name).key for name in version0BadFlags]
         else:
             flux = schema.find(self.config.fluxField).key
             fluxErr = schema.find(self.config.fluxField + "Sigma").key
-            goodFlags = [schema.find(name).key for name in self.config.goodFlags]
             badFlags = [schema.find(name).key for name in self.config.badFlags]
+
         return pipeBase.Struct(flux=flux, fluxErr=fluxErr, goodFlags=goodFlags, badFlags=badFlags)
 
     @pipeBase.timeMethod