Use new afw Polygon contains APIS

lsst · Oct 4, 2022 · c7c9704 · c7c9704
1 parent 1180860
commit c7c9704
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/python/lsst/ip/isr/vignette.py b/python/lsst/ip/isr/vignette.py
@@ -180,21 +180,17 @@ def maskVignettedRegion(exposure, polygon, maskPlane="NO_DATA", vignetteValue=No
         return
 
     fullyIlluminated = True
-    for corner in exposure.getBBox().getCorners():
-        if not polygon.contains(geom.Point2D(corner)):
-            fullyIlluminated = False
+    if not all(polygon.contains(exposure.getBBox().getCorners())):
+        fullyIlluminated = False
     log.info("Exposure is fully illuminated? %s", fullyIlluminated)
 
     if not fullyIlluminated:
         # Scan pixels.
         mask = exposure.getMask()
-        numPixels = mask.getBBox().getArea()
-        xx, yy = np.meshgrid(np.arange(0, mask.getWidth(), dtype=int),
-                             np.arange(0, mask.getHeight(), dtype=int))
+        xx, yy = np.meshgrid(np.arange(0, mask.getWidth(), dtype=float),
+                             np.arange(0, mask.getHeight(), dtype=float))
 
-        vignMask = np.array([not polygon.contains(geom.Point2D(x, y)) for x, y in
-                             zip(xx.reshape(numPixels), yy.reshape(numPixels))])
-        vignMask = vignMask.reshape(mask.getHeight(), mask.getWidth())
+        vignMask = ~(polygon.contains(xx, yy))
 
         bitMask = mask.getPlaneBitMask(maskPlane)
         maskArray = mask.getArray()