Merge branch 'tickets/DM-45750'

lsst · Oct 23, 2024 · c0de518 · c0de518
2 parents 15331d9 + 1ebcef3
commit c0de518
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/pipelines/DECam/ApVerify.yaml b/pipelines/DECam/ApVerify.yaml
@@ -7,8 +7,10 @@ imports:
     # Include all metrics from standard pipeline. It's not practical to create
     # a metrics subset because it would require constant micromanagement.
     exclude:
-      - apPipe
+      - prompt
   - location: $AP_PIPE_DIR/pipelines/DECam/ApPipe.yaml
+    include:
+      - prompt
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/pipelines/DECam/ApVerifyWithFakes.yaml b/pipelines/DECam/ApVerifyWithFakes.yaml
@@ -11,8 +11,10 @@ imports:
     # Include all metrics from standard pipeline. It's not practical to create
     # a metrics subset because it would require constant micromanagement.
     exclude:
-      - apPipe
+      - prompt
   - location: $AP_PIPE_DIR/pipelines/DECam/ApPipeWithFakes.yaml
+    include:
+      - prompt
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/pipelines/HSC/ApVerify.yaml b/pipelines/HSC/ApVerify.yaml
@@ -7,8 +7,10 @@ imports:
     # Include all metrics from standard pipeline. It's not practical to create
     # a metrics subset because it would require constant micromanagement.
     exclude:
-      - apPipe
+      - prompt
   - location: $AP_PIPE_DIR/pipelines/HSC/ApPipe.yaml
+    include:
+      - prompt
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/pipelines/HSC/ApVerifyWithFakes.yaml b/pipelines/HSC/ApVerifyWithFakes.yaml
@@ -8,8 +8,10 @@ imports:
     # Include all metrics from standard pipeline. It's not practical to create
     # a metrics subset because it would require constant micromanagement.
     exclude:
-      - apPipe
+      - prompt
   - location: $AP_PIPE_DIR/pipelines/HSC/ApPipeWithFakes.yaml
+    include:
+      - prompt
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/pipelines/LSSTCam-imSim/ApVerify.yaml b/pipelines/LSSTCam-imSim/ApVerify.yaml
@@ -7,8 +7,10 @@ imports:
     # Include all metrics from standard pipeline. It's not practical to create
     # a metrics subset because it would require constant micromanagement.
     exclude:
-      - apPipe
+      - prompt
   - location: $AP_PIPE_DIR/pipelines/LSSTCam-imSim/ApPipe.yaml
+    include:
+      - prompt
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/pipelines/LSSTCam-imSim/ApVerifyWithFakes.yaml b/pipelines/LSSTCam-imSim/ApVerifyWithFakes.yaml
@@ -8,8 +8,10 @@ imports:
     # Include all metrics from standard pipeline. It's not practical to create
     # a metrics subset because it would require constant micromanagement.
     exclude:
-      - apPipe
+      - prompt
   - location: $AP_PIPE_DIR/pipelines/LSSTCam-imSim/ApPipeWithFakes.yaml
+    include:
+      - prompt
 tasks:
   # ApVerify override removed by excluding apPipe.
   diaPipe:

diff --git a/pipelines/_ingredients/ApVerify.yaml b/pipelines/_ingredients/ApVerify.yaml
@@ -3,6 +3,8 @@
 description: Fully instrumented AP pipeline.
 imports:
   - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipe.yaml
+    include:
+      - prompt
   - location: $AP_VERIFY_DIR/pipelines/_ingredients/MetricsRuntime.yaml
     exclude:
       - timing_calibrate

diff --git a/pipelines/_ingredients/ApVerifyWithFakes.yaml b/pipelines/_ingredients/ApVerifyWithFakes.yaml
@@ -4,6 +4,8 @@
 description: Fully instrumented AP pipeline with fakes
 imports:
   - location: $AP_PIPE_DIR/pipelines/_ingredients/ApPipeWithFakes.yaml
+    include:
+      - prompt
   # Most metrics should not be run with fakes, to avoid bias or contamination.
   - location: $AP_VERIFY_DIR/pipelines/_ingredients/ConversionsForFakes.yaml
 tasks:

diff --git a/pipelines/_ingredients/MetricsRuntime.yaml b/pipelines/_ingredients/MetricsRuntime.yaml
@@ -90,14 +90,6 @@ tasks:
       connections.metric: MapDiaSourceTime
       connections.labelName: transformDiaSrcCat
       target: transformDiaSrcCat.run
-  timing_diaCatalogLoader:
-    class: lsst.verify.tasks.commonMetrics.TimingMetricTask
-    config:
-      connections.package: ap_association
-      connections.metric: LoadDiaCatalogsTime
-      connections.labelName: loadDiaCatalogs
-      metadataDimensions: [instrument, group, detector]  # TimingMetricTask assumes visit
-      target: loadDiaCatalogs.run
   timing_diaPipe_associator:
     class: lsst.verify.tasks.commonMetrics.TimingMetricTask
     config:
@@ -212,14 +204,6 @@ tasks:
       connections.metric: MapDiaSourceCpuTime
       connections.labelName: transformDiaSrcCat
       target: transformDiaSrcCat.run
-  cputiming_diaCatalogLoader:
-    class: lsst.verify.tasks.commonMetrics.CpuTimingMetricTask
-    config:
-      connections.package: ap_association
-      connections.metric: LoadDiaCatalogsCpuTime
-      connections.labelName: loadDiaCatalogs
-      metadataDimensions: [instrument, group, detector]  # CpuTimingMetricTask assumes visit
-      target: loadDiaCatalogs.run
   cputiming_diaPipe_associator:
     class: lsst.verify.tasks.commonMetrics.CpuTimingMetricTask
     config: