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

IsrTask: check for non-finite darktime #26

Merged
merged 1 commit into from
Jan 16, 2017
Merged

IsrTask: check for non-finite darktime #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions python/lsst/ip/isr/isrTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,11 +594,17 @@ def darkCorrection(self, exposure, darkExposure):
\param[in,out] exposure exposure to process
\param[in] darkExposure dark exposure of same size as exposure
"""
expScale = exposure.getInfo().getVisitInfo().getDarkTime()
if math.isnan(expScale):
raise RuntimeError("Exposure darktime is NAN")
darkScale = darkExposure.getInfo().getVisitInfo().getDarkTime()
if math.isnan(darkScale):
raise RuntimeError("Dark calib darktime is NAN")
isr.darkCorrection(
maskedImage=exposure.getMaskedImage(),
darkMaskedImage=darkExposure.getMaskedImage(),
expScale=exposure.getInfo().getVisitInfo().getExposureTime(),
darkScale=darkExposure.getInfo().getVisitInfo().getExposureTime(),
expScale=expScale,
darkScale=darkScale,
)

def doLinearize(self, detector):
Expand Down
41 changes: 41 additions & 0 deletions tests/testBiasAndDarkCorrection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,47 @@ def testDark2(self):
def testDark3(self):
self.doDark(scaling=3.7)

def testDarkWithDarktime(self):
darkTime = 128.0
nan = float("NAN")

exp = afwImage.ExposureF(1, 1)
exp.getMaskedImage().getImage().set(1.0)
exp.getMaskedImage().getMask().set(0)
exp.getMaskedImage().getVariance().set(1.0)

dark = afwImage.ExposureF(1, 1)
dark.getMaskedImage().getImage().set(1.0/darkTime)
dark.getMaskedImage().getMask().set(0)
dark.getMaskedImage().getVariance().set(0.0)
dark.getInfo().setVisitInfo(afwImage.makeVisitInfo())

task = ipIsr.IsrTask()

# No darktime set in at least one of the inputs
exp.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=nan))
dark.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=nan))
with self.assertRaises(RuntimeError):
task.darkCorrection(exp, dark)
exp.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=nan))
dark.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=1.0))
with self.assertRaises(RuntimeError):
task.darkCorrection(exp, dark)
exp.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=1.0))
dark.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=nan))
with self.assertRaises(RuntimeError):
task.darkCorrection(exp, dark)

# With darktime set
exp.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=darkTime))
dark.getInfo().setVisitInfo(afwImage.makeVisitInfo(darkTime=1.0))
task.darkCorrection(exp, dark)

self.assertEqual(exp.getMaskedImage().getImage().get(0, 0), 0.0)
self.assertEqual(exp.getMaskedImage().getMask().get(0, 0), 0)
self.assertEqual(exp.getMaskedImage().getVariance().get(0, 0), 1.0)
self.assertEqual(exp.getInfo().getVisitInfo().getDarkTime(), darkTime) # Hasn't been modified


class MemoryTester(lsst.utils.tests.MemoryTestCase):
pass
Expand Down