From 04709911a9640417db7b009988a74da9381d0f19 Mon Sep 17 00:00:00 2001 From: Christopher Waters Date: Fri, 11 Nov 2022 12:46:14 -0800 Subject: [PATCH 1/3] Set overscan fittype to MEDIAN_PER_ROW. --- config/isr.py | 1 + config/latiss/isr.py | 1 + 2 files changed, 2 insertions(+) diff --git a/config/isr.py b/config/isr.py index 26baf0a3..c32e3f23 100644 --- a/config/isr.py +++ b/config/isr.py @@ -28,3 +28,4 @@ config.doCrosstalk = True config.qa.doThumbnailOss = False config.qa.doThumbnailFlattened = False +config.overscan.fitType = "MEDIAN_PER_ROW" diff --git a/config/latiss/isr.py b/config/latiss/isr.py index 3cf41687..b8519158 100644 --- a/config/latiss/isr.py +++ b/config/latiss/isr.py @@ -24,3 +24,4 @@ """ config.doCrosstalk=False config.doDefect=True +config.overscan.fitType="MEDIAN_PER_ROW" From e3829863993333c8f4a74c99d30a8ec38065cf3c Mon Sep 17 00:00:00 2001 From: Christopher Waters Date: Fri, 11 Nov 2022 12:46:48 -0800 Subject: [PATCH 2/3] Fix ITL serial overscan size. --- policy/cameraHeader.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/policy/cameraHeader.yaml b/policy/cameraHeader.yaml index 40da2c6a..3694ba41 100644 --- a/policy/cameraHeader.yaml +++ b/policy/cameraHeader.yaml @@ -68,11 +68,11 @@ AMP_ITL : &_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 From c51922859b71c351bed8ccb3f3b3b0d83c79f1bd Mon Sep 17 00:00:00 2001 From: Christopher Waters Date: Fri, 11 Nov 2022 12:47:09 -0800 Subject: [PATCH 3/3] Disable test that will always fail. --- python/lsst/obs/lsst/assembly.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/python/lsst/obs/lsst/assembly.py b/python/lsst/obs/lsst/assembly.py index b2ba89d3..81afafbd 100644 --- a/python/lsst/obs/lsst/assembly.py +++ b/python/lsst/obs/lsst/assembly.py @@ -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: