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.

Sign up for GitHub

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

Jump to bottom

DM-39227: Adapt to upstream deprecations in connections and related config fields #146

Merged
merged 2 commits into from
Jul 13, 2023
Merged

DM-39227: Adapt to upstream deprecations in connections and related config fields #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd48bb0
Switch to new approach for configuring MakeWarp connections.
TallJimbo Jun 30, 2023
1388bb6
Adapt to renaming in SubtractImage configs.
TallJimbo Jul 7, 2023
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
4 changes: 1 addition & 3 deletions config/HSC/coaddBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@
# permanently remove the obs_* configs, we should check that none of the
# changes made there since April 12, 2022 would be useful here.

# Configs shared between makeCoaddTempExp and assemble
# Configs shared between makeWarp and assemble
config.matchingKernelSize = 29
config.doApplyExternalPhotoCalib = True
config.doApplyExternalSkyWcs = True
3 changes: 0 additions & 3 deletions config/HSC/makeWarp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,3 @@
config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
config.warpAndPsfMatch.warp.warpingKernelName = 'lanczos5'
config.coaddPsf.warpingKernelName = 'lanczos5'

# This is properly configured in ApTemplate.yaml, but must also be here for now
config.doApplyFinalizedPsf = False
7 changes: 0 additions & 7 deletions config/LSSTCam-imSim/makeWarp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,9 @@
config.warpAndPsfMatch.psfMatch.kernel['AL'].alardSigGauss = [1.0, 2.0, 4.5]
config.modelPsf.defaultFwhm = 7.7

# FUTURE: Set both to True when we decide to run jointcal
config.doApplyExternalPhotoCalib = False
config.doApplyExternalSkyWcs = False

# FUTURE: Set to True when we have sky background estimate
config.doApplySkyCorr = False

# This is properly configured in ApTemplate.yaml, but must also be here for now
config.doApplyFinalizedPsf = False

# This file was inserted from obs_lsst/config/imsim/makeWarp.py as part of
# DM-31063. Feel free to modify this file to better reflect the needs of AP;
# however, when it comes time to permanently remove the obs_* configs, we
Expand Down
3 changes: 1 addition & 2 deletions pipelines/HyperSuprimeCam/ApTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ tasks:
# Config file wipes out all pre-existing configs, so copy base pipeline
# config on top.
connections.visitSummary: "{calexpType}visitSummary"
useVisitSummaryPsf: False
doWriteEmptyWarps: True
doApplyExternalPhotoCalib: False
doApplyExternalSkyWcs: False
makePsfMatched: True
assembleCoadd:
class: lsst.pipe.tasks.assembleCoadd.CompareWarpAssembleCoaddTask
Expand Down
3 changes: 1 addition & 2 deletions pipelines/LsstCamImSim/ApTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ tasks:
# Config file wipes out all pre-existing configs, so copy base pipeline
# config on top.
connections.visitSummary: "{calexpType}visitSummary"
useVisitSummaryPsf: False
doWriteEmptyWarps: True
doApplyExternalPhotoCalib: False
doApplyExternalSkyWcs: False
makePsfMatched: True
assembleCoadd:
class: lsst.pipe.tasks.assembleCoadd.CompareWarpAssembleCoaddTask
Expand Down
2 changes: 1 addition & 1 deletion pipelines/_ingredients/ApPipe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ tasks:
class: lsst.ip.diffim.subtractImages.AlardLuptonSubtractTask
config:
connections.coaddName: parameters.coaddName
doApplyFinalizedPsf: False
doApplyExternalCalibrations: False
detectAndMeasure:
class: lsst.ip.diffim.detectAndMeasure.DetectAndMeasureTask
config:
Expand Down
6 changes: 3 additions & 3 deletions pipelines/_ingredients/ApTemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ tasks:
# in this pipeline since there's nothing to update relative to the
# original visitSummary.
connections.visitSummary: "{calexpType}visitSummary"
# The original visitSummary also doesn't have PSFs, so use the calexp
# PSFs (and ApCorrMaps).
useVisitSummaryPsf: False
doWriteEmptyWarps: True
doApplyExternalPhotoCalib: False
doApplyExternalSkyWcs: False
makePsfMatched: True
doApplyFinalizedPsf: False
assembleCoadd:
class: lsst.pipe.tasks.assembleCoadd.CompareWarpAssembleCoaddTask
config:
Expand Down