Change use of deprecated image operator <<= to [:] in python code

lsst · Oct 16, 2015 · 9d934e8 · 9d934e8
1 parent 97168e0
commit 9d934e8
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/python/lsst/afw/cameraGeom/utils.py b/python/lsst/afw/cameraGeom/utils.py
@@ -627,7 +627,7 @@ def makeImageFromCamera(camera, detectorNameList=None, background=numpy.nan, buf
 
         imView = camIm.Factory(camIm, bbox, afwImage.LOCAL)
         try:
-            imView <<= im
+            imView[:] = im
         except Exception as e:
             pass
 

diff --git a/python/lsst/afw/display/utils.py b/python/lsst/afw/display/utils.py
@@ -207,7 +207,7 @@ def makeMosaic(self, images=None, display="deferToFrame", mode=None, background=
                                      (smosaic.getHeight() - im.getHeight())//2)
                 smosaic = smosaic.Factory(smosaic, afwGeom.Box2I(llc, im.getDimensions()), afwImage.LOCAL)
 
-            smosaic <<= im
+            smosaic[:] = im
 
         display = _getDisplayFromDisplayOrFrame(display, frame)
         if display:

diff --git a/tests/convolve.py b/tests/convolve.py
@@ -326,7 +326,7 @@ def runBasicConvolveEdgeTest(self, kernel, kernelDescr):
         # reset the good region to the original convolved image;
         # this should reset the entire convolved image to its original self
         cnvMaskedImageGoodView = afwImage.MaskedImageF(cnvMaskedImage, goodBox, afwImage.LOCAL, False)
-        cnvMaskedImageGoodView <<= cnvMaskedImageCopyViewOfGoodRegion
+        cnvMaskedImageGoodView[:] = cnvMaskedImageCopyViewOfGoodRegion
 
         # assert that these two are equal
         cnvImMaskVarArr = cnvMaskedImage.getArrays()

diff --git a/tests/image.py b/tests/image.py
@@ -316,7 +316,7 @@ def testSubimages(self):
 
         image2 = afwImage.ImageF(simage.getDimensions())
         image2.set(666)
-        simage <<= image2
+        simage[:] = image2
         del simage
         del image2
 
@@ -346,7 +346,7 @@ def testSubimages2(self):
 
         image2 = afwImage.ImageF(simage.getDimensions())
         image2.set(666)
-        simage <<= image2
+        simage[:] = image2
         del simage
         del image2
 
@@ -476,7 +476,7 @@ def testCreateDecoratedImage(self):
 
     def testCreateDecoratedImageFromImage(self):
         image = afwImage.ImageF(afwGeom.Extent2I(self.width, self.height))
-        image <<= self.dimage1.getImage()
+        image[:] = self.dimage1.getImage()
 
         dimage = afwImage.DecoratedImageF(image)
         self.assertEqual(dimage.getWidth(), self.width)

diff --git a/tests/mask.py b/tests/mask.py
@@ -194,7 +194,7 @@ def testSubmasks(self):
         mask2 = afwImage.MaskU(smask.getDimensions())
 
         mask2.set(666)
-        smask <<= mask2
+        smask[:] = mask2
 
         del smask
         del mask2

diff --git a/tests/maskedImage.py b/tests/maskedImage.py
@@ -458,7 +458,7 @@ def testSubimages1(self):
         mimage2 = afwImage.MaskedImageF(simage.getDimensions())
         mimage2.getImage().set(666)
         mimage2.getMask().set(self.BAD)
-        simage <<= mimage2
+        simage[:] = mimage2
 
         del simage
         del mimage2
@@ -488,7 +488,7 @@ def testSubimages2(self):
 
         mimage2 = afwImage.MaskedImageF(simage.getDimensions())
         mimage2.set(666, self.BAD, 0.0)
-        simage <<= mimage2
+        simage[:] = mimage2
         del simage
         del mimage2
 
@@ -536,7 +536,7 @@ def testVariance(self):
         gain = 2
 
         var = self.mimage.getVariance()
-        var <<= self.mimage.getImage()
+        var[:] = self.mimage.getImage()
         var /= gain
 
     def testTicket653(self):

diff --git a/tests/rgb.py b/tests/rgb.py
@@ -86,7 +86,7 @@ def setUp(self):
             afwMath.randomGaussianImage(randomImage, rand)
             randomImage *= 2
             convolvedImage += randomImage
-            self.images[i] <<= convolvedImage
+            self.images[i][:] = convolvedImage
         del convolvedImage; del randomImage
 
     def tearDown(self):

diff --git a/tests/scaledPlus.py b/tests/scaledPlus.py
@@ -68,7 +68,7 @@ def runScaledAddTest(self, coeff0, coeff1):
         im1ArrSet = self.maskedImage1.getArrays()
 
         desMaskedImage = afwImage.MaskedImageF(self.maskedImage0.getDimensions())
-        desMaskedImage <<= self.maskedImage0
+        desMaskedImage[:] = self.maskedImage0
         desMaskedImage *= coeff0
         desMaskedImage.scaledPlus(coeff1, self.maskedImage1)
         desImArrSet = desMaskedImage.getArrays()