From acc235dbcd508e25ec10b101e55d698df0822bb0 Mon Sep 17 00:00:00 2001 From: Alexandre Boucaud Date: Wed, 24 May 2023 00:49:27 +0200 Subject: [PATCH 1/2] Remove hardcoded skymap names --- .../analysis/tools/tasks/associatedSourcesTractAnalysis.py | 3 ++- python/lsst/analysis/tools/tasks/objectTableSurveyAnalysis.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/python/lsst/analysis/tools/tasks/associatedSourcesTractAnalysis.py b/python/lsst/analysis/tools/tasks/associatedSourcesTractAnalysis.py index 4211ba975..9c66bc728 100644 --- a/python/lsst/analysis/tools/tasks/associatedSourcesTractAnalysis.py +++ b/python/lsst/analysis/tools/tasks/associatedSourcesTractAnalysis.py @@ -27,6 +27,7 @@ from lsst.cp.pipe._lookupStaticCalibration import lookupStaticCalibration from lsst.geom import Box2D from lsst.pipe.base import connectionTypes as ct +from lsst.skymap import BaseSkyMap from ..interfaces import AnalysisBaseConfig, AnalysisBaseConnections, AnalysisPipelineTask @@ -58,7 +59,7 @@ class AssociatedSourcesTractAnalysisConnections( skyMap = ct.Input( doc="Input definition of geometry/bbox and projection/wcs for warped exposures", - name="skyMap", + name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME, storageClass="SkyMap", dimensions=("skymap",), ) diff --git a/python/lsst/analysis/tools/tasks/objectTableSurveyAnalysis.py b/python/lsst/analysis/tools/tasks/objectTableSurveyAnalysis.py index 4244db7e3..416a40219 100644 --- a/python/lsst/analysis/tools/tasks/objectTableSurveyAnalysis.py +++ b/python/lsst/analysis/tools/tasks/objectTableSurveyAnalysis.py @@ -30,6 +30,7 @@ from lsst.daf.butler import DataCoordinate, DeferredDatasetHandle from lsst.pipe.base import connectionTypes as ct +from lsst.skymap import BaseSkyMap from ..actions.plot.plotUtils import shorten_list from ..interfaces import AnalysisBaseConfig, AnalysisBaseConnections, AnalysisPipelineTask, KeyedData @@ -42,7 +43,7 @@ class ObjectTableSurveyAnalysisConnections( ): skymap = ct.Input( doc="Input definition of geometry/bbox and projection/wcs for warped exposures", - name="skyMap", + name=BaseSkyMap.SKYMAP_DATASET_TYPE_NAME, storageClass="SkyMap", dimensions=("skymap",), ) From 965f92627d873bace59f2ff1371d56e96d9823ce Mon Sep 17 00:00:00 2001 From: Alexandre Boucaud Date: Wed, 24 May 2023 19:04:14 +0200 Subject: [PATCH 2/2] Clean up commented code --- python/lsst/analysis/tools/actions/plot/skyPlot.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/python/lsst/analysis/tools/actions/plot/skyPlot.py b/python/lsst/analysis/tools/actions/plot/skyPlot.py index d982e7715..03a95d22e 100644 --- a/python/lsst/analysis/tools/actions/plot/skyPlot.py +++ b/python/lsst/analysis/tools/actions/plot/skyPlot.py @@ -36,8 +36,6 @@ from ...statistics import nansigmaMad from .plotUtils import addPlotInfo, mkColormap, plotProjectionWithBinning, sortAllArrays -# from .plotUtils import generateSummaryStats, parsePlotInfo - class SkyPlot(PlotAction): """Plots the on sky distribution of a parameter.