Merge branch 'tickets/DM-26040'

lsst · Aug 21, 2020 · 8da2693 · 8da2693
2 parents 4a07256 + 804fbca
commit 8da2693
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 0 deletions.
diff --git a/config/default_image_metrics.py b/config/default_image_metrics.py
@@ -23,10 +23,17 @@
     "apPipe:differencer:subtract.subtractExposures": "ip_diffim.ImagePsfMatchTime",
     "apPipe:differencer:detection.run": "meas_algorithms.SourceDetectionTime",
     "apPipe:differencer:measurement.run": "ip_diffim.DipoleFitTime",
+    "apPipe:diaPipe.run": "ap_association.DiaPipelineTime",
+    "apPipe:diaPipe:diaSourceDpddifier.run": "ap_association.MapDiaSourceTime",
+    "apPipe:diaPipe:diaCatalogLoader.run": "ap_association.LoadDiaCatalogsTime",
     "apPipe:diaPipe:associator.run": "ap_association.AssociationTime",
+    "apPipe:diaPipe:diaForcedSource.run": "ap_association.DiaForcedSourceTime",
+    "apPipe:diaPipe:alertPackager.run": "ap_association.PackageAlertsTime",
 }
 memoryConfigs = {
     "apPipe.runDataRef": "ap_pipe.ApPipeMemory",
+    "apPipe:diaPipe:diaForcedSource.run": "ap_association.DiaForcedSourceMemory",
+    "apPipe:diaPipe:alertPackager.run": "ap_association.PackageAlertsMemory",
 }
 for target, metric in timingConfigs.items():
     subConfig = TimingMetricConfig()

diff --git a/pipelines/MetricsRuntime.yaml b/pipelines/MetricsRuntime.yaml
@@ -72,17 +72,66 @@ tasks:
             connections.labelName: imageDifference
             metadataDimensions: [instrument, visit, detector, skymap]
             target: imageDifference:measurement.run
+    timing_diaPipe:
+        class: lsst.verify.tasks.commonMetrics.TimingMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: DiaPipelineTime
+            connections.labelName: diaPipe
+            target: diaPipe.run
+    timing_diaPipe_diaSourceDpddifier:
+        class: lsst.verify.tasks.commonMetrics.TimingMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: MapDiaSourceTime
+            connections.labelName: diaPipe
+            target: diaPipe:diaSourceDpddifier.run
+    timing_diaPipe_diaCatalogLoader:
+        class: lsst.verify.tasks.commonMetrics.TimingMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: LoadDiaCatalogsTime
+            connections.labelName: diaPipe
+            target: diaPipe:diaCatalogLoader.run
     timing_diaPipe_associator:
         class: lsst.verify.tasks.commonMetrics.TimingMetricTask
         config:
             connections.package: ap_association
             connections.metric: AssociationTime
             connections.labelName: diaPipe
             target: diaPipe:associator.run
+    timing_diaPipe_diaForcedSource:
+        class: lsst.verify.tasks.commonMetrics.TimingMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: DiaForcedSourceTime
+            connections.labelName: diaPipe
+            target: diaPipe:diaForcedSource.run
+    timing_diaPipe_alertPackager:
+        class: lsst.verify.tasks.commonMetrics.TimingMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: PackageAlertsTime
+            connections.labelName: diaPipe
+            target: diaPipe:alertPackager.run
     memory_apPipe:
         class: lsst.verify.tasks.commonMetrics.MemoryMetricTask
         config:
             connections.package: ap_pipe
             connections.metric: ApPipeMemory
             connections.labelName: diaPipe
             target: diaPipe.run  # Memory use is peak over process, so measure last task
+    memory_diaForcedSource:
+        class: lsst.verify.tasks.commonMetrics.MemoryMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: DiaForcedSourceMemory
+            connections.labelName: diaPipe
+            target: diaPipe:diaForcedSource.run
+    memory_alertPackager:
+        class: lsst.verify.tasks.commonMetrics.MemoryMetricTask
+        config:
+            connections.package: ap_association
+            connections.metric: PackageAlertsMemory
+            connections.labelName: diaPipe
+            target: diaPipe:alertPackager.run