Merge pull request #329 from lsst/tickets/DM-39778

DM-39778: Rework analysis tools for property maps to have one analysis task for all properties
lsst · Jan 22, 2025 · 7181132 · 7181132
2 parents b511f2d + fdf7429
commit 7181132
Show file tree

Hide file tree

Showing 10 changed files with 610 additions and 706 deletions.
diff --git a/pipelines/coaddQualityCore.yaml b/pipelines/coaddQualityCore.yaml
@@ -90,36 +90,30 @@ tasks:
       python: |
         from lsst.analysis.tools.atools import *
   plotPropertyMapTract:
-    class: lsst.analysis.tools.tasks.PropertyMapTractAnalysisTask
+    class: lsst.analysis.tools.tasks.PerTractPropertyMapAnalysisTask
     config:
       connections.outputName: propertyMapTract
-      atools.HealSparseMap: PropertyMapTool
       zoomFactors: [2, 8]
+      projectionKwargs:
+        celestial: true
+        gridlines: true
+      colorbarKwargs:
+        cmap: viridis
+      # The entries in the 'atools' namespace must exactly match the dataset types.
+      atools.deepCoadd_dcr_ddec_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_dcr_dra_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_dcr_e1_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_dcr_e2_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_epoch_map_min: PerTractPropertyMapTool
+      atools.deepCoadd_epoch_map_max: PerTractPropertyMapTool
+      atools.deepCoadd_epoch_map_mean: PerTractPropertyMapTool
+      atools.deepCoadd_exposure_time_map_sum: PerTractPropertyMapTool
+      atools.deepCoadd_exposure_time_map_sum.nBinsHist: 35
+      atools.deepCoadd_psf_e1_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_psf_e2_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_psf_maglim_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_psf_size_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_sky_background_map_weighted_mean: PerTractPropertyMapTool
+      atools.deepCoadd_sky_noise_map_weighted_mean: PerTractPropertyMapTool
       python: |
-        from lsst.analysis.tools.atools import *
-        config.properties["dcr_ddec"] = PropertyMapConfig
-        config.properties["dcr_ddec"].operations = ["weighted_mean"]
-        config.properties["dcr_dra"] = PropertyMapConfig
-        config.properties["dcr_dra"].operations = ["weighted_mean"]
-        config.properties["dcr_e1"] = PropertyMapConfig
-        config.properties["dcr_e1"].operations = ["weighted_mean"]
-        config.properties["dcr_e2"] = PropertyMapConfig
-        config.properties["dcr_e2"].operations = ["weighted_mean"]
-        config.properties["epoch"] = PropertyMapConfig
-        config.properties["epoch"].operations = ["min", "max", "mean"]
-        config.properties["exposure_time"] = PropertyMapConfig
-        config.properties["exposure_time"].coaddName = "deep"
-        config.properties["exposure_time"].operations = ["sum"]
-        config.properties["exposure_time"].nBinsHist = 35
-        config.properties["psf_e1"] = PropertyMapConfig
-        config.properties["psf_e1"].operations = ["weighted_mean"]
-        config.properties["psf_e2"] = PropertyMapConfig
-        config.properties["psf_e2"].operations = ["weighted_mean"]
-        config.properties["psf_maglim"] = PropertyMapConfig
-        config.properties["psf_maglim"].operations = ["weighted_mean"]
-        config.properties["psf_size"] = PropertyMapConfig
-        config.properties["psf_size"].operations = ["weighted_mean"]
-        config.properties["sky_background"] = PropertyMapConfig
-        config.properties["sky_background"].operations = ["weighted_mean"]
-        config.properties["sky_noise"] = PropertyMapConfig
-        config.properties["sky_noise"].operations = ["weighted_mean"]
+        from lsst.analysis.tools.atools import PerTractPropertyMapTool
diff --git a/pipelines/surveyQualityCore.yaml b/pipelines/surveyQualityCore.yaml
@@ -1,10 +1,10 @@
 description: |
   Tier1 plots and metrics to assess survey-wide quality
 tasks:
-  plotPropertyMapSurveyWide:
-    class: lsst.analysis.tools.tasks.PropertyMapSurveyWideAnalysisTask
+  plotPropertyMapSurvey:
+    class: lsst.analysis.tools.tasks.SurveyWidePropertyMapAnalysisTask
     config:
-      connections.outputName: propertyMapSurveyWide
+      connections.outputName: propertyMapSurvey
       autozoom: true
       projection: McBryde
       projectionKwargs:
@@ -16,20 +16,20 @@ tasks:
       colorbarKwargs:
         location: top
         cmap: viridis
-      # The entries in the 'atools' namespace must exactly match the dataset type.
-      atools.deepCoadd_dcr_ddec_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_dcr_dra_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_dcr_e1_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_dcr_e2_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_epoch_consolidated_map_min: HealSparsePropertyMapTool
-      atools.deepCoadd_epoch_consolidated_map_max: HealSparsePropertyMapTool
-      atools.deepCoadd_epoch_consolidated_map_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_exposure_time_consolidated_map_sum: HealSparsePropertyMapTool
-      atools.deepCoadd_psf_e1_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_psf_e2_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_psf_maglim_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_psf_size_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_sky_background_consolidated_map_weighted_mean: HealSparsePropertyMapTool
-      atools.deepCoadd_sky_noise_consolidated_map_weighted_mean: HealSparsePropertyMapTool
+      # The entries in the 'atools' namespace must exactly match the dataset types.
+      atools.deepCoadd_dcr_ddec_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_dcr_dra_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_dcr_e1_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_dcr_e2_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_epoch_consolidated_map_min: SurveyWidePropertyMapTool
+      atools.deepCoadd_epoch_consolidated_map_max: SurveyWidePropertyMapTool
+      atools.deepCoadd_epoch_consolidated_map_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_exposure_time_consolidated_map_sum: SurveyWidePropertyMapTool
+      atools.deepCoadd_psf_e1_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_psf_e2_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_psf_maglim_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_psf_size_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_sky_background_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
+      atools.deepCoadd_sky_noise_consolidated_map_weighted_mean: SurveyWidePropertyMapTool
       python: |
-        from lsst.analysis.tools.atools import HealSparsePropertyMapTool
+        from lsst.analysis.tools.atools import SurveyWidePropertyMapTool