Move pviMetrics into visitQualityCore for calibrateImage switch.

lsst · Jan 29, 2025 · 4a38c26 · 4a38c26
1 parent dc6e20c
commit 4a38c26
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 76 deletions.
diff --git a/pipelines/pviMetrics.yaml b/pipelines/pviMetrics.yaml
diff --git a/pipelines/visitQualityCore.yaml b/pipelines/visitQualityCore.yaml
@@ -47,39 +47,60 @@ tasks:
     config:
       atools.astromColorDiffMetrics: TargetRefCatDeltaColorMetrics
       python: from lsst.analysis.tools.atools import *
-  # TO DO: DM-46932: Remove/edit/rename the following two tasks for DM-43077.
   calexpSummary:
     class: lsst.analysis.tools.tasks.CalexpSummaryAnalysisTask
     config:
       atools.calexpSummaryMetrics: CalexpSummaryMetrics
       python: from lsst.analysis.tools.atools import *
-  analyzeCalibrateMetadata:
+  analyzeCalibrateImageMetadata:
     class: lsst.analysis.tools.tasks.TaskMetadataAnalysisTask
     config:
-      connections.inputName: calibrate_metadata
-      connections.outputName: calibrate_metadata  # Will be appended with "_metrics"
+      connections.inputName: calibrateImage_metadata
+      connections.outputName: calibrateImage_metadata  # Will be appended with "_metrics"
       connections.storageClass: TaskMetadata
+      raiseNoWorkFoundOnIncompleteMetadata: true
       inputDimensions: ["instrument", "visit", "detector"]
-      atools.calexpMetadataMetrics: TaskMetadataMetricTool
-      atools.calexpMetadataMetrics.taskName: calibrate
-      atools.calexpMetadataMetrics.metrics:
-        positive_footprint_count: ct
-        negative_footprint_count: ct
-        source_count: ct
-        sky_footprint_count: ct
-        saturated_source_count: ct
-        bad_source_count: ct
+      atools.calibrateImageMetadataMetrics: TaskMetadataMetricTool
+      atools.calibrateImageMetadataMetrics.taskName: calibrateImage
+      atools.calibrateImageMetadataMetrics.metrics:
+        initial_psf_positive_footprint_count: ct
+        initial_psf_negative_footprint_count: ct
+        initial_psf_positive_peak_count: ct
+        initial_psf_negative_peak_count: ct
+        simple_psf_positive_footprint_count: ct
+        simple_psf_negative_footprint_count: ct
+        simple_psf_positive_peak_count: ct
+        simple_psf_negative_peak_count: ct
         bad_mask_fraction: ""
         cr_mask_fraction: ""
         crosstalk_mask_fraction: ""
+        detected_mask_fraction: ""
+        detected_negative_mask_fraction: ""
         edge_mask_fraction: ""
         intrp_mask_fraction: ""
         no_data_mask_fraction: ""
-        detected_mask_fraction: ""
-        detected_negative_mask_fraction: ""
         sat_mask_fraction: ""
-        streak_mask_fraction: ""
         suspect_mask_fraction: ""
         unmaskednan_mask_fraction: ""
+        numAvailStars: ct
+        numGoodStars: ct
+        sky_footprint_count: ct
+        post_deblend_source_count: ct
+        star_count: ct
+        saturated_source_count: ct
+        bad_source_count: ct
+        cosmic_ray_count: ct
+        matched_psf_star_count: ct
+        final_psf_sigma: pixel
+        astrometry_matches_count: ct
+        photometry_matches_count: ct
+      atools.calibrateImageMetadataMetrics.subTaskNames:
+        numAvailStars: psf_measure_psf
+        numGoodStars: psf_measure_psf
+        sky_footprint_count: star_sky_sources
+        cosmic_ray_count: psf_repair
+      atools.calibrateImageMetadataMetrics.newNames:
+        numAvailStars: psf_available_star_count
+        numGoodStars: psf_good_star_count
       python: |
         from lsst.analysis.tools.atools import TaskMetadataMetricTool