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.

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

DM-33429: Add ability to do both serial and parallel overscan correction #219

Merged
merged 4 commits into from Aug 6, 2022

Conversation

czwa
Copy link
Contributor

@czwa czwa commented Jul 13, 2022

  • Remove isrFunction intermediate for overscan correction.
  • Add support for parallel overscan correction.
  • Fix handling of column/row skipping, to ensure that overscan result is subtracted where needed.
  • Consolidate unit tests for overscan correction in one location.

@czwa czwa requested a review from PaulPrice July 13, 2022 21:17
Copy link
Contributor

@PaulPrice PaulPrice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commits need to be orthogonalised, and testing needs to be re-enabled/expanded.

python/lsst/ip/isr/isrTask.py Show resolved Hide resolved
python/lsst/ip/isr/isrTask.py Outdated Show resolved Hide resolved
self.metadata[f"FIT MEDIAN {amp.getName()}"] = qaMedian
self.metadata[f"FIT STDEV {amp.getName()}"] = qaStdev
self.metadata[f"FIT MEDIAN {amp.getName()}"] = overscanResults.overscanMean
self.metadata[f"FIT STDEV {amp.getName()}"] = overscanResults.overscanSigma
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do they have to go in this task's metadata? Can't they go in the overscan task's metadata? In general, the overscan task should do everything to do with the overscan, and the ISR task should delegate everything to do with the overscan to the overscan task.

python/lsst/ip/isr/isrTask.py Outdated Show resolved Hide resolved
python/lsst/ip/isr/isrTask.py Show resolved Hide resolved
python/lsst/ip/isr/overscan.py Outdated Show resolved Hide resolved
@@ -254,7 +254,7 @@ def test_illumCorrection(self):
with self.assertRaises(RuntimeError):
ipIsr.illuminationCorrection(self.mi, flatMi, 1.0, trimToFit=False)

def test_overscanCorrection_isInt(self):
def notest_overscanCorrection_isInt(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why have these been disabled? There's no note in the commit message, and it's not clear what "to check for Jenkins level failures" means.
Besides disabling the tests, there are other functional changes, which should probably be part of a different commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been removed, as the coverage is handled by the test_overscanCorrection.py tests.

python/lsst/ip/isr/overscan.py Show resolved Hide resolved
python/lsst/ip/isr/overscan.py Show resolved Hide resolved
statAfter = computeImageMedianAndStd(self.inputExp.image[self.amp.getRawDataBBox()])
self.assertLess(statAfter[0], statBefore[0])

def notest_overscanCorrection_isInt(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These tests are still disabled.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage now provided by other tests and this method removed.

@czwa czwa force-pushed the tickets/DM-33429 branch 2 times, most recently from 84b3b45 to 73e2235 Compare August 2, 2022 22:09
* Remove isrFunction code for overscans.
* Move overscan bbox handling to overscan task.
* Add support for parallel overscan correction.
@czwa czwa merged commit 09d229e into main Aug 6, 2022
@czwa czwa deleted the tickets/DM-33429 branch August 6, 2022 03:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants