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-34989: Update obs_lsst to fix common problems. #428

Merged
merged 3 commits into from Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions config/isr.py
Expand Up @@ -28,3 +28,4 @@
config.doCrosstalk = True
config.qa.doThumbnailOss = False
config.qa.doThumbnailFlattened = False
config.overscan.fitType = "MEDIAN_PER_ROW"
1 change: 1 addition & 0 deletions config/latiss/isr.py
Expand Up @@ -24,3 +24,4 @@
"""
config.doCrosstalk=False
config.doDefect=True
config.overscan.fitType="MEDIAN_PER_ROW"
4 changes: 2 additions & 2 deletions policy/cameraHeader.yaml
Expand Up @@ -68,11 +68,11 @@ AMP_ITL : &AMP_ITL
readCorner : LL

# [[x0, y0], [xsize, ysize]]
rawBBox : [[0, 0], [544, 2048]] # total size of one amp's raw data
rawBBox : [[0, 0], [576, 2048]] # total size of one amp's raw data

rawDataBBox : [[3, 0], [509, 2000]] # data region in raw data
rawSerialPrescanBBox : [[0, 0], [3, 2000]] # serial prescan (often == extended)
rawSerialOverscanBBox : [[512, 0], [32, 2000]] # serial overscan
rawSerialOverscanBBox : [[512, 0], [64, 2000]] # serial overscan
rawParallelPrescanBBox : [[0, 1], [0, 0]] # pixels digitised before first parallel transfer
rawParallelOverscanBBox : [[3, 2000], [509, 48]] # parallel overscan

Expand Down
10 changes: 8 additions & 2 deletions python/lsst/obs/lsst/assembly.py
Expand Up @@ -168,8 +168,14 @@ def logCmd(*args):
datasec = bboxFromIraf(d["DATASEC"]) if "DATASEC" in d else None
biassec = bboxFromIraf(d["BIASSEC"]) if "BIASSEC" in d else None

if detsec and outAmp.getBBox() != detsec:
logCmd("DETSEC doesn't match (%s != %s)", outAmp.getBBox(), detsec)
# 2022-11-11: There is a known issue that the header DETSEC have
# the y-axis values flipped between the C0x and C1x entries. This
# is incorrect, and disagrees with the cameraGeom values.
# DM-36115 contains additional details. This test has been
# disabled to remove useless warnings until that is resolved.
# if detsec and outAmp.getBBox() != detsec:
# logCmd("DETSEC doesn't match (%s != %s)",
# outAmp.getBBox(), detsec)
if datasec and outAmp.getRawDataBBox() != datasec:
logCmd("DATASEC doesn't match for (%s != %s)", outAmp.getRawDataBBox(), detsec)
if biassec and outAmp.getRawHorizontalOverscanBBox() != biassec:
Expand Down