Merge pull request #146 from lsst/tickets/DM-39227

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

config/HSC/coaddBase.py

@@ -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

config/HSC/makeWarp.py

@@ -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

config/LSSTCam-imSim/makeWarp.py

@@ -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

pipelines/HyperSuprimeCam/ApTemplate.yaml

@@ -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

pipelines/LsstCamImSim/ApTemplate.yaml

@@ -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

pipelines/_ingredients/ApPipe.yaml

@@ -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:

pipelines/_ingredients/ApTemplate.yaml

@@ -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: