From 02b5ee971fe7da5a3d0f9bf3f6fc7cdee480ef73 Mon Sep 17 00:00:00 2001
From: John Parejko <parejkoj@uw.edu>
Date: Tue, 30 Jul 2024 16:34:14 -0700
Subject: [PATCH] Switch to calibrateImage outputs

---
 .../lsst/ip/diffim/computeSpatiallySampledMetrics.py |  2 +-
 python/lsst/ip/diffim/detectAndMeasure.py            |  2 +-
 python/lsst/ip/diffim/getTemplate.py                 | 12 ++++++------
 python/lsst/ip/diffim/metrics.py                     |  4 ++--
 python/lsst/ip/diffim/subtractImages.py              |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/python/lsst/ip/diffim/computeSpatiallySampledMetrics.py b/python/lsst/ip/diffim/computeSpatiallySampledMetrics.py
index 57e5e7f6..2fca85e8 100644
--- a/python/lsst/ip/diffim/computeSpatiallySampledMetrics.py
+++ b/python/lsst/ip/diffim/computeSpatiallySampledMetrics.py
@@ -46,7 +46,7 @@ class SpatiallySampledMetricsConnections(pipeBase.PipelineTaskConnections,
         doc="Input science exposure.",
         dimensions=("instrument", "visit", "detector"),
         storageClass="ExposureF",
-        name="{fakesType}calexp"
+        name="{fakesType}initial_pvi"
     )
     matchedTemplate = pipeBase.connectionTypes.Input(
         doc="Warped and PSF-matched template used to create the difference image.",
diff --git a/python/lsst/ip/diffim/detectAndMeasure.py b/python/lsst/ip/diffim/detectAndMeasure.py
index 9a3fe823..dc0bcfde 100644
--- a/python/lsst/ip/diffim/detectAndMeasure.py
+++ b/python/lsst/ip/diffim/detectAndMeasure.py
@@ -52,7 +52,7 @@ class DetectAndMeasureConnections(pipeBase.PipelineTaskConnections,
         doc="Input science exposure.",
         dimensions=("instrument", "visit", "detector"),
         storageClass="ExposureF",
-        name="{fakesType}calexp"
+        name="{fakesType}initial_pvi"
     )
     matchedTemplate = pipeBase.connectionTypes.Input(
         doc="Warped and PSF-matched template used to create the difference image.",
diff --git a/python/lsst/ip/diffim/getTemplate.py b/python/lsst/ip/diffim/getTemplate.py
index 9a27a7c2..fe16174d 100644
--- a/python/lsst/ip/diffim/getTemplate.py
+++ b/python/lsst/ip/diffim/getTemplate.py
@@ -44,14 +44,14 @@ class GetTemplateConnections(pipeBase.PipelineTaskConnections,
                                                "warpTypeSuffix": "",
                                                "fakesType": ""}):
     bbox = pipeBase.connectionTypes.Input(
-        doc="BBoxes of calexp used determine geometry of output template",
-        name="{fakesType}calexp.bbox",
+        doc="Bounding box of exposure used determine geometry of output template.",
+        name="{fakesType}initial_pvi.bbox",
         storageClass="Box2I",
         dimensions=("instrument", "visit", "detector"),
     )
     wcs = pipeBase.connectionTypes.Input(
-        doc="WCS of the calexp that we want to fetch the template for",
-        name="{fakesType}calexp.wcs",
+        doc="WCS of the exposure that we want to fetch the template for.",
+        name="{fakesType}initial_pvi.wcs",
         storageClass="Wcs",
         dimensions=("instrument", "visit", "detector"),
     )
@@ -437,8 +437,8 @@ class GetDcrTemplateConnections(GetTemplateConnections,
                                                   "warpTypeSuffix": "",
                                                   "fakesType": ""}):
     visitInfo = pipeBase.connectionTypes.Input(
-        doc="VisitInfo of calexp used to determine observing conditions.",
-        name="{fakesType}calexp.visitInfo",
+        doc="VisitInfo of exposure used to determine observing conditions.",
+        name="{fakesType}initial_pvi.visitInfo",
         storageClass="VisitInfo",
         dimensions=("instrument", "visit", "detector"),
     )
diff --git a/python/lsst/ip/diffim/metrics.py b/python/lsst/ip/diffim/metrics.py
index ae34cb2a..e4785717 100644
--- a/python/lsst/ip/diffim/metrics.py
+++ b/python/lsst/ip/diffim/metrics.py
@@ -43,7 +43,7 @@ class NumberSciSourcesMetricConnections(
 ):
     sources = connectionTypes.Input(
         doc="The catalog of science sources.",
-        name="src",
+        name="initial_stars_footprints_detector",
         storageClass="SourceCatalog",
         dimensions={"instrument", "visit", "detector"},
     )
@@ -98,7 +98,7 @@ class FractionDiaSourcesToSciSourcesMetricConnections(
                           "metric": "fracDiaSourcesToSciSources"}):
     sciSources = connectionTypes.Input(
         doc="The catalog of science sources.",
-        name="src",
+        name="initial_stars_footprints_detector",
         storageClass="SourceCatalog",
         dimensions={"instrument", "visit", "detector"},
     )
diff --git a/python/lsst/ip/diffim/subtractImages.py b/python/lsst/ip/diffim/subtractImages.py
index bc7d5262..0b20e28d 100644
--- a/python/lsst/ip/diffim/subtractImages.py
+++ b/python/lsst/ip/diffim/subtractImages.py
@@ -55,14 +55,14 @@ class SubtractInputConnections(lsst.pipe.base.PipelineTaskConnections,
         doc="Input science exposure to subtract from.",
         dimensions=("instrument", "visit", "detector"),
         storageClass="ExposureF",
-        name="{fakesType}calexp"
+        name="{fakesType}initial_pvi"
     )
     sources = connectionTypes.Input(
         doc="Sources measured on the science exposure; "
             "used to select sources for making the matching kernel.",
         dimensions=("instrument", "visit", "detector"),
         storageClass="SourceCatalog",
-        name="{fakesType}src"
+        name="{fakesType}initial_stars_footprints_detector"
     )
     visitSummary = connectionTypes.Input(
         doc=("Per-visit catalog with final calibration objects. "