Merge pull request #299 from lsst-dm/tickets/DM-50385

erinleighh · web-flow · commit 9c14798ad435 · 2025-04-22T17:24:00.000-07:00
DM-50385: Rename task and dataset labels for RFC-1088
diff --git a/doc/playbook.rst b/doc/playbook.rst
@@ -348,7 +348,7 @@ One raw was ingested, visit-defined, and kept in the development central repo, s
 .. code-block:: sh
 
    apdb-cli create-sql "sqlite:///apdb.db" apdb_config.yaml
-   pipetask run -b s3://rubin-pp-dev-users/central_repo_2 -i LSSTComCamSim/raw/all,LSSTComCamSim/defaults,LSSTComCamSim/templates -o u/${USER}/add-dataset-types -d "instrument='LSSTComCamSim' and exposure=7024062700235 and detector=8" -p $AP_PIPE_DIR/pipelines/LSSTComCamSim/ApPipe.yaml -c parameters:apdb_config=apdb_config.yaml -c diaPipe:doPackageAlerts=False --register-dataset-types --init-only
+   pipetask run -b s3://rubin-pp-dev-users/central_repo_2 -i LSSTComCamSim/raw/all,LSSTComCamSim/defaults,LSSTComCamSim/templates -o u/${USER}/add-dataset-types -d "instrument='LSSTComCamSim' and exposure=7024062700235 and detector=8" -p $AP_PIPE_DIR/pipelines/LSSTComCamSim/ApPipe.yaml -c parameters:apdb_config=apdb_config.yaml -c associateApdb:doPackageAlerts=False --register-dataset-types --init-only
 
 .. note::
 
diff --git a/pipelines/HSC/SingleFrame.yaml b/pipelines/HSC/SingleFrame.yaml
@@ -6,4 +6,4 @@ imports:
   - location: $AP_PIPE_DIR/pipelines/HSC/SingleFrame.yaml
     include:
       - apPipeSingleFrame
-      - initialPviCore
+      - analyzeCalibrationMetrics
diff --git a/pipelines/LATISS/ApPipe-noAlerts.yaml b/pipelines/LATISS/ApPipe-noAlerts.yaml
@@ -5,7 +5,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LATISS/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       alertPackager.doProduceAlerts: False
diff --git a/pipelines/LATISS/ApPipe-noForced.yaml b/pipelines/LATISS/ApPipe-noForced.yaml
@@ -8,7 +8,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LATISS/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       doRunForcedMeasurement: false  # see DM-43402
diff --git a/pipelines/LATISS/ApPipe.yaml b/pipelines/LATISS/ApPipe.yaml
@@ -9,7 +9,7 @@ imports:
     include:
       - prompt
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       # Alert distribution only runnable in PP environment.
diff --git a/pipelines/LATISS/SingleFrame.yaml b/pipelines/LATISS/SingleFrame.yaml
@@ -6,4 +6,4 @@ imports:
   - location: $AP_PIPE_DIR/pipelines/LATISS/SingleFrame.yaml
     include:
       - apPipeSingleFrame
-      - initialPviCore
+      - analyzeCalibrationMetrics
diff --git a/pipelines/LSSTCam-imSim/ApPipe.yaml b/pipelines/LSSTCam-imSim/ApPipe.yaml
@@ -9,7 +9,7 @@ imports:
     include:
       - prompt
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       # Alert distribution only runnable in PP environment.
diff --git a/pipelines/LSSTCam-imSim/SingleFrame.yaml b/pipelines/LSSTCam-imSim/SingleFrame.yaml
@@ -6,4 +6,4 @@ imports:
   - location: $AP_PIPE_DIR/pipelines/LSSTCam-imSim/SingleFrame.yaml
     include:
       - apPipeSingleFrame
-      - initialPviCore
+      - analyzeCalibrationMetrics
diff --git a/pipelines/LSSTCam/ApPipe-noAlerts.yaml b/pipelines/LSSTCam/ApPipe-noAlerts.yaml
@@ -5,7 +5,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LSSTCam/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       alertPackager.doProduceAlerts: False
diff --git a/pipelines/LSSTCam/ApPipe-noForced.yaml b/pipelines/LSSTCam/ApPipe-noForced.yaml
@@ -8,7 +8,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LSSTCam/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       doRunForcedMeasurement: false  # see DM-43402
diff --git a/pipelines/LSSTCam/ApPipe.yaml b/pipelines/LSSTCam/ApPipe.yaml
@@ -9,7 +9,7 @@ imports:
     include:
       - prompt
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       # Alert distribution only runnable in PP environment.
diff --git a/pipelines/LSSTCam/SingleFrame.yaml b/pipelines/LSSTCam/SingleFrame.yaml
@@ -6,4 +6,4 @@ imports:
   - location: $AP_PIPE_DIR/pipelines/LSSTCam/SingleFrame.yaml
     include:
       - apPipeSingleFrame
-      - initialPviCore
+      - analyzeCalibrationMetrics
diff --git a/pipelines/LSSTComCam/ApPipe-noAlerts.yaml b/pipelines/LSSTComCam/ApPipe-noAlerts.yaml
@@ -5,7 +5,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LSSTComCam/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       alertPackager.doProduceAlerts: False
diff --git a/pipelines/LSSTComCam/ApPipe-noForced.yaml b/pipelines/LSSTComCam/ApPipe-noForced.yaml
@@ -8,7 +8,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LSSTComCam/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       doRunForcedMeasurement: false  # see DM-43402
diff --git a/pipelines/LSSTComCam/ApPipe.yaml b/pipelines/LSSTComCam/ApPipe.yaml
@@ -9,7 +9,7 @@ imports:
     include:
       - prompt
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       # Alert distribution only runnable in PP environment.
diff --git a/pipelines/LSSTComCam/SingleFrame.yaml b/pipelines/LSSTComCam/SingleFrame.yaml
@@ -6,4 +6,4 @@ imports:
   - location: $AP_PIPE_DIR/pipelines/LSSTComCam/SingleFrame.yaml
     include:
       - apPipeSingleFrame
-      - initialPviCore
+      - analyzeCalibrationMetrics
diff --git a/pipelines/LSSTComCamSim/ApPipe-noAlerts.yaml b/pipelines/LSSTComCamSim/ApPipe-noAlerts.yaml
@@ -5,7 +5,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LSSTComCamSim/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       alertPackager.doProduceAlerts: False
diff --git a/pipelines/LSSTComCamSim/ApPipe-noForced.yaml b/pipelines/LSSTComCamSim/ApPipe-noForced.yaml
@@ -8,7 +8,7 @@ description: >-
 imports:
   - location: $PROMPT_PROCESSING_DIR/pipelines/LSSTComCamSim/ApPipe.yaml
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       doRunForcedMeasurement: false  # see DM-43402
diff --git a/pipelines/LSSTComCamSim/ApPipe.yaml b/pipelines/LSSTComCamSim/ApPipe.yaml
@@ -9,7 +9,7 @@ imports:
     include:
       - prompt
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       # Alert distribution only runnable in PP environment.
diff --git a/pipelines/LSSTComCamSim/SingleFrame.yaml b/pipelines/LSSTComCamSim/SingleFrame.yaml
@@ -6,4 +6,4 @@ imports:
   - location: $AP_PIPE_DIR/pipelines/LSSTComCamSim/SingleFrame.yaml
     include:
       - apPipeSingleFrame
-      - initialPviCore
+      - analyzeCalibrationMetrics
diff --git a/tests/data/ApPipe.yaml b/tests/data/ApPipe.yaml
@@ -6,8 +6,12 @@ parameters:
   # Use dataset's specific templates
   coaddName: goodSeeing
 tasks:
-  diaPipe:
+  associateApdb:
     class: lsst.ap.association.DiaPipelineTask
     config:
       doSolarSystemAssociation: false
       alertPackager.doProduceAlerts: false  # Hard to make init-outputs otherwise
+  rewarpTemplate:
+    class: lsst.ip.diffim.getTemplate.GetTemplateTask
+    config:
+      connections.coaddExposures: goodSeeingCoadd
diff --git a/tests/test_middleware_interface.py b/tests/test_middleware_interface.py
@@ -782,7 +782,7 @@ def test_run_pipeline_early_exception(self):
                 self.interface.run_pipeline({1})
 
     def test_run_pipeline_late_exception(self):
-        """Test behavior when execution fails in diaPipe cleanup.
+        """Test behavior when execution fails in associateApdb cleanup.
         """
         self._prepare_run_pipeline()
 
