DM-39227: rework (with deprecation) external-calibration connections. #812
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TallJimbo
force-pushed
the
tickets/DM-39227
branch
from
adf8e04
to
af2a9a6
Compare
TallJimbo
force-pushed
the
tickets/DM-39227
branch
from
af2a9a6
to
cf8c781
Compare
laurenam
approved these changes
Jul 12, 2023
python/lsst/pipe/tasks/makeWarp.py
Outdated
| if config.select.target != lsst.pipe.tasks.selectImages.PsfWcsSelectImagesTask: | ||
| del self.visitSummary | ||
| # We always drop the deprecated wcsList and bboxList connections, | ||
| # since we can always equivalents from the visitSummary dataset. |
There was a problem hiding this comment.
"....since we can always use/get equivalents from..."
python/lsst/pipe/tasks/makeWarp.py
Outdated
| deprecated=( | ||
| "Deprecated in favor of the 'visitSummary' connection (and already ignored). " | ||
| "Will be removed after v27." | ||
| ) | ||
| ) | ||
| visitSummary = connectionTypes.Input( | ||
| doc="Consolidated exposure metadata", |
There was a problem hiding this comment.
Update doc to match those in meas_base (or vice-versa)?
doc="Input visit-summary catalog with updated calibration objects.",
python/lsst/pipe/tasks/makeWarp.py
Outdated
| row = visitSummary.find(dataId["detector"]) | ||
| if row is None: | ||
| raise RuntimeError( | ||
| f"Unexpectedly incomplete visitSummary provided to makeWarp: {dataId} missing." |
There was a problem hiding this comment.
"...{dataId} is missing"?
python/lsst/pipe/tasks/makeWarp.py
Outdated
| "If True, use the PSF model and aperture corrections from the 'visitSummary' connection. " | ||
| "If False, use the PSF model and aperture corrections from the 'exposure' connection. " | ||
| # TODO: remove this next sentence on DM-39854. | ||
| "The finalizedPsfApCorrCatalog connection (if enabled) takes precedence over either. " |
There was a problem hiding this comment.
Extra blank space after period.
python/lsst/pipe/tasks/makeWarp.py
Outdated
| row = visitSummary.find(detectorId) | ||
| if row is None: | ||
| raise RuntimeError( | ||
| f"Unexpectedly incomplete visitSummary: detector={detectorId} missing." |
There was a problem hiding this comment.
"...{dataId} is missing"?
| ) | ||
| exposure = connectionTypes.Input( | ||
| doc="Input exposure to perform photometry on.", | ||
| name="calexp", | ||
| storageClass="ExposureF", | ||
| dimensions=["instrument", "visit", "detector"], | ||
| ) | ||
| visitSummary = connectionTypes.Input( | ||
| doc="Consolidated exposure metadata", |
There was a problem hiding this comment.
Update doc to match those in meas_base (or vice-versa)?
doc="Input visit-summary catalog with updated calibration objects.",
| @@ -528,10 +585,15 @@ def prepareCalibratedExposure(self, exposure, externalSkyWcsCatalog=None, extern | |||
| Exposure catalog with external skyWcs to be applied | |||
| if config.doApplyExternalSkyWcs=True. Catalog uses the detector id | |||
| for the catalog id, sorted on id for fast lookup. | |||
| Deprecated in favor of 'visitSummary`; will be removed after v27. | |||
There was a problem hiding this comment.
Do the inconsistent ticks matter (here and below)?
| ) | ||
|
|
||
| def __init__(self, *, config=None): | ||
| super().__init__(config=config) | ||
| # Same connection boilerplate as all other applications of | ||
| # Global/Tract calibrations | ||
| keepSkyMap = False |
There was a problem hiding this comment.
Should there be a TODO in here?
| @@ -532,6 +550,9 @@ def prepareCalibratedExposure(self, exposure, externalSkyWcsCatalog=None, extern | |||
| Exposure catalog with external photoCalib to be applied | |||
| if config.doApplyExternalPhotoCalib=True. Catalog uses the detector | |||
| id for the catalog id, sorted on id for fast lookup. | |||
| visitSummary : `lsst.afw.table.ExposureCatalog`, optional | |||
| Exposure catalog with all calibration objects. WCS and PhotoCalib | |||
| are always applied if provided and present. | |||
There was a problem hiding this comment.
I think I know what you mean, but "provided and present" sounds redundant.
I think visitSummary should provide anything any else a 'select' subtask implementation might need, and that's why the TODO code comments can be removed here as well.
Since only finalVisitSummary has PSF and ApCorrMap, this adds a new useVisitSummaryPsf config option that can be set to False to use the calexp for those instead. In all other cases we skip any detectors for which the visit summary doesn't provide what we want, because we expect that to represent our best calibrations and we don't want to include detectors without those in the coadd.
TallJimbo
force-pushed
the
tickets/DM-39227
branch
from
cf8c781
to
0b6a2b8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.