Switch lsst.log usage to logging

python/lsst/pipe/tasks/assembleCoadd.py

@@ -23,6 +23,7 @@
 import copy
 import numpy
 import warnings
+import logging
 import lsst.pex.config as pexConfig
 import lsst.pex.exceptions as pexExceptions
 import lsst.geom as geom
@@ -34,7 +35,6 @@
 import lsst.coadd.utils as coaddUtils
 import lsst.pipe.base as pipeBase
 import lsst.meas.algorithms as measAlg
-import lsst.log as log
 import lsstDebug
 import lsst.utils as utils
 from lsst.skymap import BaseSkyMap
@@ -52,6 +52,8 @@
            "SafeClipAssembleCoaddTask", "SafeClipAssembleCoaddConfig",
            "CompareWarpAssembleCoaddTask", "CompareWarpAssembleCoaddConfig"]
 
+log = logging.getLogger(__name__.partition(".")[2])
+
 
 class AssembleCoaddConnections(pipeBase.PipelineTaskConnections,
                                dimensions=("tract", "patch", "band", "skymap"),

python/lsst/pipe/tasks/makeCoaddTempExp.py

@@ -20,14 +20,14 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 import numpy
+import logging
 
 import lsst.pex.config as pexConfig
 import lsst.daf.persistence as dafPersist
 import lsst.afw.image as afwImage
 import lsst.coadd.utils as coaddUtils
 import lsst.pipe.base as pipeBase
 import lsst.pipe.base.connectionTypes as connectionTypes
-import lsst.log as log
 import lsst.utils as utils
 import lsst.geom
 from lsst.meas.algorithms import CoaddPsf, CoaddPsfConfig
@@ -39,6 +39,8 @@
 
 __all__ = ["MakeCoaddTempExpTask", "MakeWarpTask", "MakeWarpConfig"]
 
+log = logging.getLogger(__name__.partition(".")[2])
+
 
 class MissingExposureError(Exception):
     """Raised when data cannot be retrieved for an exposure.

python/lsst/pipe/tasks/objectMasks.py

@@ -21,11 +21,11 @@
 
 import re
 import os.path
+import logging
 import lsst.daf.base as dafBase
 import lsst.geom as geom
 import lsst.afw.table as afwTable
 from lsst.daf.butler.formatters.file import FileFormatter
-from lsst.log import Log
 
 
 class ObjectMaskCatalog:
@@ -118,7 +118,7 @@ def read(fileName):
         region definitions.
         """
 
-        log = Log.getLogger("ObjectMaskCatalog")
+        log = logging.getLogger("ObjectMaskCatalog")
 
         brightObjects = ObjectMaskCatalog()
         checkedWcsIsFk5 = False

tests/test_isPrimaryFlag.py

@@ -22,14 +22,14 @@
 import os
 import unittest
 import numpy as np
+import logging
 
 from lsst.geom import Point2I, Box2I, Extent2I
 from lsst.skymap import TractInfo
 from lsst.skymap.patchInfo import PatchInfo
 import lsst.afw.image as afwImage
 import lsst.utils.tests
 from lsst.utils import getPackageDir
-from lsst.log import Log
 from lsst.pipe.tasks.characterizeImage import CharacterizeImageTask, CharacterizeImageConfig
 from lsst.pipe.tasks.calibrate import CalibrateTask, CalibrateConfig
 from lsst.meas.algorithms import SourceDetectionTask, SkyObjectsTask
@@ -160,7 +160,7 @@ def setUp(self):
         self.charImResults = charImTask.run(self.exposure)
 
         # set log level so that warnings do not display
-        Log.getLogger("calibrate").setLevel(Log.ERROR)
+        logging.getLogger("calibrate").setLevel(logging.ERROR)
 
     def tearDown(self):
         del self.exposure

tests/test_photoCal.py

@@ -21,6 +21,7 @@
 #
 import os
 import unittest
+import logging
 
 import numpy as np
 import astropy.units as u
@@ -32,14 +33,14 @@
 import lsst.afw.image as afwImage
 import lsst.utils.tests
 from lsst.utils import getPackageDir
-from lsst.log import Log
 from lsst.pipe.tasks.photoCal import PhotoCalTask, PhotoCalConfig
 from lsst.pipe.tasks.colorterms import Colorterm, ColortermDict, ColortermLibrary
+from lsst.pipe.base.task_logging import LOG_TRACE
 
 RefCatDir = os.path.join(getPackageDir("pipe_tasks"), "tests", "data", "sdssrefcat")
 
 # Quiet down meas_astrom logging, so we can see PhotoCal logs better
-Log.getLogger("LoadIndexedReferenceObjectsTask").setLevel(Log.WARN)
+logging.getLogger("LoadIndexedReferenceObjectsTask").setLevel(logging.WARN)
 
 testColorterms = ColortermLibrary(data={
     "test*": ColortermDict(data={
@@ -85,8 +86,8 @@ def setUp(self):
         # Make a reference loader
         butler = Butler(RefCatDir)
         self.refObjLoader = LoadIndexedReferenceObjectsTask(butler=butler)
-        logLevel = Log.TRACE
-        self.log = Log.getLogger('testPhotoCal')
+        logLevel = LOG_TRACE
+        self.log = logging.getLogger('testPhotoCal')
         self.log.setLevel(logLevel)
 
         self.config = PhotoCalConfig()

tests/test_psfCandidateSelection.py

@@ -21,11 +21,11 @@
 #
 import os
 import unittest
+import logging
 
 import lsst.afw.image as afwImage
 import lsst.utils.tests
 from lsst.utils import getPackageDir
-from lsst.log import Log
 from lsst.pipe.tasks.characterizeImage import CharacterizeImageTask
 
 
@@ -36,7 +36,7 @@ def setUp(self):
         expPath = os.path.join(getPackageDir("pipe_tasks"), "tests", "data", "v695833-e0-c000-a00.sci.fits")
         self.exposure = afwImage.ExposureF(expPath)
         # set log level so that warnings do not display
-        Log.getLogger("characterizeImage").setLevel(Log.ERROR)
+        logging.getLogger("characterizeImage").setLevel(logging.ERROR)
 
     def tearDown(self):
         del self.exposure

tests/test_skySources.py

@@ -21,11 +21,11 @@
 
 import os
 import unittest
+import logging
 
 import lsst.afw.image as afwImage
 import lsst.utils.tests
 from lsst.utils import getPackageDir
-from lsst.log import Log
 from lsst.pipe.tasks.characterizeImage import CharacterizeImageTask, CharacterizeImageConfig
 from lsst.pipe.tasks.calibrate import CalibrateTask, CalibrateConfig
 
@@ -37,7 +37,7 @@ def setUp(self):
         expPath = os.path.join(getPackageDir("pipe_tasks"), "tests", "data", "v695833-e0-c000-a00.sci.fits")
         self.exposure = afwImage.ExposureF(expPath)
         # set log level so that warnings do not display
-        Log.getLogger("calibrate").setLevel(Log.ERROR)
+        logging.getLogger("calibrate").setLevel(logging.ERROR)
 
     def tearDown(self):
         del self.exposure