Skip to content

Commit

Permalink
Enable CutOutDonutsScienceSensorTask to operate for a pair with same-…
Browse files Browse the repository at this point in the history
…sign focusZ.
  • Loading branch information
jfcrenshaw committed Oct 29, 2024
1 parent 164c127 commit f09cd77
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
8 changes: 8 additions & 0 deletions doc/versionHistory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
Version History
##################

.. _lsst.ts.wep-12.5.0:

-------------
12.5.0
-------------

* Enable CutOutDonutsScienceSensorTask to operate for a pair with same-sign focusZ.

.. _lsst.ts.wep-12.4.2:

-------------
Expand Down
12 changes: 1 addition & 11 deletions python/lsst/ts/wep/task/cutOutDonutsScienceSensorTask.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,22 +183,12 @@ def assignExtraIntraIdx(self, focusZVal0, focusZVal1, cameraName):
"""

if cameraName in ["LSSTCam", "LSSTComCam", "LSSTComCamSim"]:
errorStr = "Must have one extra-focal and one intra-focal image."
if focusZVal0 < 0:
# Check that other image does not have same defocal direction
if focusZVal1 <= 0:
raise ValueError(errorStr)
extraExpIdx = 1
intraExpIdx = 0
elif focusZVal0 > 0:
# Check that other image does not have same defocal direction
if focusZVal1 >= 0:
raise ValueError(errorStr)
else:
extraExpIdx = 0
intraExpIdx = 1
else:
# Need to be defocal images ('FOCUSZ != 0')
raise ValueError(errorStr)
elif cameraName == "LATISS":
errorStr = "Must have two images with different FOCUSZ parameter."
if focusZVal0 != focusZVal1:
Expand Down

0 comments on commit f09cd77

Please sign in to comment.