Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-7000: Convert tracing to use lsst.log and remove pex.logging #38

Merged
merged 5 commits into from
Nov 22, 2016
Merged

DM-7000: Convert tracing to use lsst.log and remove pex.logging #38

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94b17fa
Promote Trace 1 error messages to logs in ERROR level
Nov 9, 2016
17de7f5
Convert pex.logging fine-level tracing to the lsst.log scheme
Oct 22, 2016
8aad119
Convert individual loggers to use lsst.log
Oct 24, 2016
939656d
Convert the examples to use lsst.log instead of pex.logging
Nov 9, 2016
3ea8fbc
Add log to the ups table
Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/compareKernelTypes.py
View file
Open in desktop
Expand Up @@ -32,14 +32,14 @@
import lsst.afw.geom as afwGeom
import lsst.afw.image as afwImage
import lsst.afw.math as afwMath
import lsst.log.utils as logUtils
import lsst.pex.config as pexConfig
import lsst.ip.diffim as ipDiffim
import lsst.pex.logging as logging

import lsst.afw.display.ds9 as ds9

verbosity = 5
logging.Trace_setVerbosity('lsst.ip.diffim', verbosity)
verbosity = 4
logUtils.traceSetAt("ip.diffim", verbosity)

display = True
writefits = False
Expand Down
24 changes: 13 additions & 11 deletions examples/compareLambdaTypes.py
View file
Open in desktop
Expand Up @@ -12,13 +12,15 @@
import lsst.afw.math as afwMath
import lsst.ip.diffim as ipDiffim
import lsst.ip.diffim.diffimTools as diffimTools
import lsst.pex.logging as logging
from lsst.log import Log
import lsst.log.utils as logUtils
import lsst.pex.config as pexConfig

import lsst.afw.display.ds9 as ds9

verbosity = 7
logging.Trace_setVerbosity('lsst.ip.diffim', verbosity)
logUtils.traceSetAt("ip.diffim", 6)
logger = Log.getLogger("ip.diffim.compareLambdaTypes")
logger.setLevel(Log.DEBUG)

display = True
writefits = False
Expand Down Expand Up @@ -187,14 +189,14 @@ def applyVisitor(self, invert=False, xloc=397, yloc=580):
return None

# delta function kernel
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, 'DF run')
logger.debug('DF run')
results1 = self.apply(pexConfig.makePolicy(self.subconfig1), self.bskv1, xloc, yloc, tmi, smi)
kSum1, bg1, dmean1, dstd1, vmean1, kImageOut1, diffIm1, kc1 = results1
res = 'DF residuals : %.3f +/- %.3f; %.2f, %.2f; %.2f %.2f, %.2f' % (self.dStats.getMean(),
self.dStats.getRms(),
kSum1, bg1,
dmean1, dstd1, vmean1)
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, res)
logger.debug(res)
if display:
ds9.mtv(tmi, frame=1) # ds9 switches frame 0 and 1 for some reason
ds9.mtv(smi, frame=0)
Expand All @@ -207,14 +209,14 @@ def applyVisitor(self, invert=False, xloc=397, yloc=580):
diffIm1.writeFits('d1.fits')

# regularized delta function kernel
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, 'DFrC5 run')
logger.debug('DFrC5 run')
results2 = self.apply(pexConfig.makePolicy(self.subconfig2), self.bskv2, xloc, yloc, tmi, smi)
kSum2, bg2, dmean2, dstd2, vmean2, kImageOut2, diffIm2, kc2 = results2
res = 'DFrC5 residuals : %.3f +/- %.3f; %.2f, %.2f; %.2f %.2f, %.2f' % (self.dStats.getMean(),
self.dStats.getRms(),
kSum2, bg2,
dmean2, dstd2, vmean2)
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, res)
logger.debug(res)
if display:
ds9.mtv(tmi, frame=4)
ds9.mtv(smi, frame=5)
Expand All @@ -225,14 +227,14 @@ def applyVisitor(self, invert=False, xloc=397, yloc=580):
diffIm2.writeFits('d2')

# regularized delta function kernel
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, 'DFrC9 run')
logger.debug('DFrC9 run')
results3 = self.apply(pexConfig.makePolicy(self.subconfig3), self.bskv3, xloc, yloc, tmi, smi)
kSum3, bg3, dmean3, dstd3, vmean3, kImageOut3, diffIm3, kc3 = results3
res = 'DFrC9 residuals : %.3f +/- %.3f; %.2f, %.2f; %.2f %.2f, %.2f' % (self.dStats.getMean(),
self.dStats.getRms(),
kSum3, bg3,
dmean3, dstd3, vmean3)
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, res)
logger.debug(res)
if display:
ds9.mtv(tmi, frame=8)
ds9.mtv(smi, frame=9)
Expand All @@ -243,14 +245,14 @@ def applyVisitor(self, invert=False, xloc=397, yloc=580):
diffIm2.writeFits('d3')

# regularized delta function kernel
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, 'DFrF12 run')
logger.debug('DFrF12 run')
results4 = self.apply(pexConfig.makePolicy(self.subconfig4), self.bskv4, xloc, yloc, tmi, smi)
kSum4, bg4, dmean4, dstd4, vmean4, kImageOut4, diffIm4, kc4 = results4
res = 'DFrF12 residuals : %.3f +/- %.3f; %.2f, %.2f; %.2f %.2f, %.2f' % (self.dStats.getMean(),
self.dStats.getRms(),
kSum4, bg4,
dmean4, dstd4, vmean4)
logging.Trace("lsst.ip.diffim.compareLambdaTypes", 1, res)
logger.debug(res)
if display:
ds9.mtv(tmi, frame=12)
ds9.mtv(smi, frame=13)
Expand Down
6 changes: 3 additions & 3 deletions examples/comparePcaKernel.py
View file
Open in desktop
Expand Up @@ -29,14 +29,14 @@
import lsst.afw.geom as afwGeom
import lsst.afw.image.imageLib as afwImage
import lsst.ip.diffim as ipDiffim
import lsst.pex.logging as pexLogging
import lsst.log.utils as logUtils
import lsst.pex.config as pexConfig
import lsst.afw.display.ds9 as ds9

display = True

verbosity = 5
pexLogging.Trace_setVerbosity("lsst.ip.diffim", verbosity)
verbosity = 4
logUtils.traceSetAt("ip.diffim", verbosity)

defDataDir = lsst.utils.getPackageDir('afwdata')
imageProcDir = lsst.utils.getPackageDir('ip_diffim')
Expand Down
6 changes: 3 additions & 3 deletions examples/crossCorrelation.py
View file
Open in desktop
Expand Up @@ -4,13 +4,13 @@
import lsst.afw.geom as afwGeom
import lsst.afw.image as afwImage
import lsst.afw.math as afwMath
import lsst.pex.logging as pexLogging
import lsst.afw.display.ds9 as ds9
import lsst.log.utils as logUtils
import pylab
import numpy as num

verbosity = 5
pexLogging.Trace_setVerbosity("lsst.ip.diffim", verbosity)
verbosity = 4
logUtils.traceSetAt("ip.diffim", verbosity)

# Define the diagnostic functions on the goodness of fit of the
# spatial model (k_s) to each individual kernel (k)
Expand Down
6 changes: 3 additions & 3 deletions examples/debugSpatialModel.py
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
import lsst.afw.math as afwMath
import lsst.ip.diffim as ipDiffim
import lsst.ip.diffim.diffimTools as diffimTools
import lsst.pex.logging as pexLogging
import lsst.log.utils as logUtils

import lsst.afw.display.ds9 as ds9
import lsst.afw.display.utils as displayUtils
Expand All @@ -40,8 +40,8 @@
fwhm = 6.8
warp = True

verbosity = 5
pexLogging.Trace_setVerbosity("lsst.ip.diffim", verbosity)
verbosity = 4
logUtils.traceSetAt("ip.diffim", verbosity)

defDataDir = lsst.utils.getPackageDir('afwdata')
imageProcDir = lsst.utils.getPackageDir('ip_diffim')
Expand Down
6 changes: 3 additions & 3 deletions examples/generateBadMatches1.py
View file
Open in desktop
Expand Up @@ -3,11 +3,11 @@
import lsst.afw.math as afwMath
import lsst.ip.diffim as ipDiffim
import numpy as num
import lsst.pex.logging as pexLogging
import lsst.log.utils as logUtils
import lsst.pex.config as pexConfig
import lsst.afw.display.ds9 as ds9
verbosity = 5
pexLogging.Trace_setVerbosity("lsst.ip.diffim", verbosity)
verbosity = 4
logUtils.traceSetAt("ip.diffim", verbosity)

imSize = 75
rdm = afwMath.Random(afwMath.Random.MT19937, 10101)
Expand Down
6 changes: 3 additions & 3 deletions examples/generateBadMatches2.py
View file
Open in desktop
Expand Up @@ -4,11 +4,11 @@
import lsst.afw.math as afwMath
import lsst.ip.diffim as ipDiffim
import numpy as num
import lsst.pex.logging as pexLogging
import lsst.log.utils as logUtils
import lsst.pex.config as pexConfig
import lsst.afw.display.ds9 as ds9
verbosity = 5
pexLogging.Trace_setVerbosity("lsst.ip.diffim", verbosity)
verbosity = 4
logUtils.traceSetAt("ip.diffim", verbosity)

imSize = 2**7
kSize = 2**5 + 1
Expand Down
35 changes: 14 additions & 21 deletions examples/jackknifeResampleSpatialKernel.py
View file
Open in desktop
Expand Up @@ -34,13 +34,16 @@
import lsst.afw.math as afwMath
import lsst.ip.diffim as ipDiffim
import lsst.ip.diffim.diffimTools as diffimTools
import lsst.pex.logging as pexLog
from lsst.log import Log
import lsst.log.utils as logUtils
import lsst.pex.config as pexConfig

import lsst.afw.display.ds9 as ds9

verbosity = 3
pexLog.Trace_setVerbosity('lsst.ip.diffim', verbosity)
verbosity = 2
logUtils.traceSetAt("ip.diffim", verbosity)

logger = Log.getLogger("ip.diffim.JackknifeResampleKernel")

display = False
writefits = False
Expand Down Expand Up @@ -97,18 +100,12 @@ def setUp(self):

def stats(self, cid, diffim, core=5):
self.dStats.apply(diffim)
pexLog.Trace("lsst.ip.diffim.JackknifeResampleKernel", 1,
"Candidate %d : Residuals all (%d px): %.3f +/- %.3f" % (cid,
self.dStats.getNpix(),
self.dStats.getMean(),
self.dStats.getRms()))
logger.debug("Candidate %d : Residuals all (%d px): %.3f +/- %.3f",
cid, self.dStats.getNpix(), self.dStats.getMean(), self.dStats.getRms())

self.dStats.apply(diffim, core)
pexLog.Trace("lsst.ip.diffim.JackknifeResampleKernel", 1,
"Candidate %d : Residuals core (%d px): %.3f +/- %.3f" % (cid,
self.dStats.getNpix(),
self.dStats.getMean(),
self.dStats.getRms()))
logger.debug("Candidate %d : Residuals core (%d px): %.3f +/- %.3f",
cid, self.dStats.getNpix(), self.dStats.getMean(), self.dStats.getRms())

def assess(self, cand, kFn1, bgFn1, kFn2, bgFn2, frame0):
tmi = cand.getTemplateMaskedImage()
Expand Down Expand Up @@ -144,12 +141,10 @@ def assess(self, cand, kFn1, bgFn1, kFn2, bgFn2, frame0):
ds9.mtv(im2, frame=frame0+4)
ds9.mtv(d2, frame=frame0+5)

pexLog.Trace("lsst.ip.diffim.JackknifeResampleKernel", 1,
"Full Spatial Model")
logger.debug("Full Spatial Model")
self.stats(cand.getId(), d1)

pexLog.Trace("lsst.ip.diffim.JackknifeResampleKernel", 1,
"N-1 Spatial Model")
logger.debug("N-1 Spatial Model")
self.stats(cand.getId(), d2)

def setStatus(self, cellSet, cid, value):
Expand Down Expand Up @@ -186,8 +181,7 @@ def jackknifeResample(self, psfmatch, results):
cid = goodList[idx]

print() # clear the screen
pexLog.Trace("lsst.ip.diffim.JackknifeResampleKernel", 1,
"Removing candidate %d" % (cid))
logger.debug("Removing candidate %d", cid)

cand = self.setStatus(cellSet, cid, afwMath.SpatialCellCandidate.BAD)

Expand All @@ -211,8 +205,7 @@ def jackknifeResample(self, psfmatch, results):
self.setStatus(cellSet, cid, afwMath.SpatialCellCandidate.GOOD)

def runTest(self, mode):
pexLog.Trace("lsst.ip.diffim.JackknifeResampleKernel", 1,
"Mode %s" % (mode))
logger.debug("Mode %s", mode)
if mode == "DF":
self.config = self.subconfigDF
elif mode == "DFr":
Expand Down
7 changes: 2 additions & 5 deletions examples/runMatchMaskedImages.py
View file
Open in desktop
Expand Up @@ -6,9 +6,7 @@

import lsst.afw.image as afwImage
import lsst.afw.display.ds9 as ds9

from lsst.pex.logging import Trace
from lsst.pex.logging import Log
import lsst.log.utils as logUtils

import lsst.ip.diffim as ipDiffim
import lsst.ip.diffim.diffimTools as diffimTools
Expand Down Expand Up @@ -88,7 +86,7 @@ def getArg(ind, defValue):

if options.verbosity > 0:
print('Verbosity =', options.verbosity)
Trace.setVerbosity('lsst.ip.diffim', options.verbosity)
logUtils.traceSetAt("ip.diffim", options.verbosity)

####

Expand Down Expand Up @@ -122,7 +120,6 @@ def getArg(ind, defValue):


def run():
Log.getDefaultLog()
main()

if __name__ == '__main__':
Expand Down
4 changes: 2 additions & 2 deletions examples/runModelToModel.py
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
import lsst.afw.geom as afwGeom
import lsst.afw.image as afwImage
import lsst.pex.policy as pexPolicy
import lsst.pex.logging as pexLog
import lsst.log.utils as logUtils
import lsst.meas.algorithms as measAlg
import lsst.afw.display.ds9 as ds9

Expand All @@ -34,7 +34,7 @@ def pcapsf_read_boost(fn):
if __name__ == '__main__':
import lsst.ip.diffim.diffimTools as diffimTools

pexLog.Trace_setVerbosity("lsst.ip.diffim", 5)
logUtils.traceSetAt("ip.diffim", 4)

calexpPath = sys.argv[1]
boostPath = sys.argv[2]
Expand Down
7 changes: 2 additions & 5 deletions examples/runSubtractExposures.py
View file
Open in desktop
Expand Up @@ -7,9 +7,7 @@
import numpy as num

import lsst.afw.image as afwImage

from lsst.pex.logging import Trace
from lsst.pex.logging import Log
import lsst.log.utils as logUtils
import lsst.meas.algorithms as measAlg

import lsst.ip.diffim as ipDiffim
Expand Down Expand Up @@ -112,7 +110,7 @@ def getArg(ind, defValue):

if options.verbosity > 0:
print('Verbosity =', options.verbosity)
Trace.setVerbosity('lsst.ip.diffim', options.verbosity)
logUtils.traceSetAt("ip.diffim", options.verbosity)

####

Expand Down Expand Up @@ -141,7 +139,6 @@ def getArg(ind, defValue):


def run():
Log.getDefaultLog()
main()

if __name__ == '__main__':
Expand Down
7 changes: 2 additions & 5 deletions examples/runSubtractMaskedImages.py
View file
Open in desktop
Expand Up @@ -7,9 +7,7 @@
import lsst.daf.base as dafBase
import lsst.afw.image as afwImage
import lsst.afw.display.ds9 as ds9

from lsst.pex.logging import Trace
from lsst.pex.logging import Log
import lsst.log.utils as logUtils

import lsst.ip.diffim as ipDiffim
import lsst.ip.diffim.diffimTools as diffimTools
Expand Down Expand Up @@ -89,7 +87,7 @@ def getArg(ind, defValue):

if options.verbosity > 0:
print('Verbosity =', options.verbosity)
Trace.setVerbosity('lsst.ip.diffim', options.verbosity)
logUtils.traceSetAt("ip.diffim", options.verbosity)

####

Expand Down Expand Up @@ -123,7 +121,6 @@ def getArg(ind, defValue):


def run():
Log.getDefaultLog()
memId0 = dafBase.Citizen_getNextMemId()
main()
# check for memory leaks
Expand Down
5 changes: 2 additions & 3 deletions examples/runSubtractSnaps.py
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@

import lsst.afw.image as afwImage
import lsst.ip.diffim as ipDiffim
from lsst.pex.logging import Log, Trace
import lsst.log.utils as logUtils


def subtractSnaps(snap1, snap2, subconfig, doWarping=False):
Expand Down Expand Up @@ -56,7 +56,7 @@ def main():
sys.exit(1)

print('Verbosity =', options.verbosity)
Trace.setVerbosity('lsst.ip.diffim', options.verbosity)
logUtils.traceSetAt("ip.diffim", options.verbosity)

snap1Exp = afwImage.ExposureF(options.s1)
snap2Exp = afwImage.ExposureF(options.s2)
Expand All @@ -70,7 +70,6 @@ def main():


def run():
Log.getDefaultLog()
main()

if __name__ == '__main__':
Expand Down