Make code pybind11 compliant

lsst · Mar 4, 2017 · 774234b · 774234b
1 parent 15f9154
commit 774234b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/python/lsst/obs/decam/decamMapper.py b/python/lsst/obs/decam/decamMapper.py
@@ -30,7 +30,7 @@
 import lsst.afw.image.utils as afwImageUtils
 from lsst.obs.base import CameraMapper, exposureFromImage
 from lsst.daf.persistence import ButlerLocation
-from lsst.ip.isr import isr
+import lsst.ip.isr as ipIsr
 import lsst.pex.policy as pexPolicy
 from .makeDecamRawVisitInfo import MakeDecamRawVisitInfo
 
@@ -339,7 +339,7 @@ def bypass_defects(self, datasetType, pythonType, butlerLocation, dataId):
         idxBad = np.nonzero(bpmImg.getArray())
         mim = afwImage.MaskedImageU(bpmImg.getDimensions())
         mim.getMask().getArray()[idxBad] |= mim.getMask().getPlaneBitMask("BAD")
-        return isr.getDefectListFromMask(mim, "BAD", growFootprints=0)
+        return ipIsr.getDefectListFromMask(mim, "BAD", growFootprints=0)
 
     def std_defects(self, item, dataId):
         """Return the defect list as it is.

diff --git a/tests/testGetRaw.py b/tests/testGetRaw.py
@@ -35,7 +35,7 @@
 import lsst.pex.exceptions as pexExcept
 import lsst.daf.persistence as dafPersist
 from lsst.obs.base import MakeRawVisitInfo
-from lsst.afw.image import RotType_UNKNOWN
+from lsst.afw.image import RotType
 from lsst.afw.coord import IcrsCoord, Coord
 from lsst.afw.geom import degrees
 
@@ -56,7 +56,7 @@
     "boresightAzAlt": Coord(61.24*degrees, (90-50.46)*degrees),
     "boresightAirmass": 1.57,
     "boresightRotAngle": float("nan")*degrees,
-    "rotType": RotType_UNKNOWN,
+    "rotType": RotType.UNKNOWN,
     "obs_longitude": 70.81489000000001*degrees,
     "obs_latitude": -30.16606*degrees,
     "obs_elevation": 2215.0,