Move countMaskedPixels to ip_isr.

lsst · Sep 9, 2022 · d59c43c · d59c43c
1 parent 104f198
commit d59c43c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 114 deletions.
diff --git a/python/lsst/cp/pipe/defects.py b/python/lsst/cp/pipe/defects.py
@@ -34,8 +34,7 @@
 from lsst.afw import cameraGeom
 from lsst.geom import Box2I, Point2I
 from lsst.meas.algorithms import SourceDetectionTask
-from lsst.ip.isr import Defects
-from .utils import countMaskedPixels
+from lsst.ip.isr import Defects, countMaskedPixels
 
 from ._lookupStaticCalibration import lookupStaticCalibration
 

diff --git a/python/lsst/cp/pipe/utils.py b/python/lsst/cp/pipe/utils.py
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-__all__ = ['countMaskedPixels', 'ddict2dict', 'CovFastFourierTransform']
+__all__ = ['ddict2dict', 'CovFastFourierTransform']
 
 import numpy as np
 from scipy.optimize import leastsq
@@ -180,26 +180,6 @@ def makeMockFlats(expTime, gain=1.0, readNoiseElectrons=5, fluxElectrons=1000,
     return flatExp1, flatExp2
 
 
-def countMaskedPixels(maskedIm, maskPlane):
-    """Count the number of pixels in a given mask plane.
-
-    Parameters
-    ----------
-    maskedIm : `~lsst.afw.image.MaskedImage`
-        Masked image to examine.
-    maskPlane : `str`
-        Name of the mask plane to examine.
-
-    Returns
-    -------
-    nPix : `int`
-        Number of pixels in the requested mask plane.
-    """
-    maskBit = maskedIm.mask.getPlaneBitMask(maskPlane)
-    nPix = np.where(np.bitwise_and(maskedIm.mask.array, maskBit))[0].flatten().size
-    return nPix
-
-
 def irlsFit(initialParams, dataX, dataY, function, weightsY=None, weightType='Cauchy', scaleResidual=True):
     """Iteratively reweighted least squares fit.
 

diff --git a/tests/test_defects.py b/tests/test_defects.py
@@ -31,7 +31,7 @@
 
 import lsst.ip.isr as ipIsr
 import lsst.cp.pipe as cpPipe
-from lsst.ip.isr import isrMock
+from lsst.ip.isr import isrMock, countMaskedPixels
 from lsst.geom import Box2I, Point2I, Extent2I
 
 
@@ -627,7 +627,7 @@ def test_edgeMasking(self):
         testImage = self.flatExp.clone()
         mi = testImage.maskedImage
 
-        self.assertEqual(cpPipe.utils.countMaskedPixels(mi, 'EDGE'), 0)
+        self.assertEqual(countMaskedPixels(mi, 'EDGE'), 0)
         self.defaultTask._setEdgeBits(mi)
 
         hEdge = self.defaultConfig.nPixBorderLeftRight
@@ -636,7 +636,7 @@ def test_edgeMasking(self):
 
         nEdge = xSize*vEdge*2 + ySize*hEdge*2 - hEdge*vEdge*4
 
-        self.assertEqual(cpPipe.utils.countMaskedPixels(mi, 'EDGE'), nEdge)
+        self.assertEqual(countMaskedPixels(mi, 'EDGE'), nEdge)
 
 
 class TestMemory(lsst.utils.tests.MemoryTestCase):

diff --git a/tests/test_utils.py b/tests/test_utils.py