Skip to content

Commit 799e9c1

Browse files
committed
Update sky plots to show the patch outlines as the default
1 parent 5022aff commit 799e9c1

File tree

7 files changed

+20
-4
lines changed

7 files changed

+20
-4
lines changed

python/lsst/analysis/tools/actions/plot/skyPlot.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@
2929
import matplotlib.pyplot as plt
3030
import numpy as np
3131
from lsst.pex.config import Field, ListField
32+
from lsst.skymap import BaseSkyMap
3233
from matplotlib.figure import Figure
3334
from matplotlib.patches import Rectangle
3435

3536
from ...interfaces import KeyedData, KeyedDataSchema, PlotAction, Scalar, Vector
3637
from ...statistics import nansigmaMad
37-
from .plotUtils import addPlotInfo, mkColormap, plotProjectionWithBinning, sortAllArrays
38+
from .plotUtils import addPlotInfo, generateSummaryStats, mkColormap, plotProjectionWithBinning, sortAllArrays
3839

3940

4041
class SkyPlot(PlotAction):
@@ -92,6 +93,9 @@ def getInputSchema(self, **kwargs) -> KeyedDataSchema:
9293
base.append(("z", Vector))
9394
base.append(("statMask", Vector))
9495

96+
if self.plotOutlines:
97+
base.append(("patch", Vector))
98+
9599
return base
96100

97101
def __call__(self, data: KeyedData, **kwargs) -> Mapping[str, Figure] | Figure:
@@ -136,6 +140,7 @@ def statsAndText(self, arr, mask=None):
136140
def makePlot(
137141
self,
138142
data: KeyedData,
143+
skymap: BaseSkyMap,
139144
plotInfo: Optional[Mapping[str, str]] = None,
140145
sumStats: Optional[Mapping] = None,
141146
**kwargs,
@@ -204,8 +209,8 @@ def makePlot(
204209
fig = plt.figure(dpi=300)
205210
ax = fig.add_subplot(111)
206211

207-
if sumStats is None:
208-
sumStats = {}
212+
if self.plotOutlines:
213+
sumStats = generateSummaryStats(data, skymap, plotInfo)
209214

210215
if plotInfo is None:
211216
plotInfo = {}

python/lsst/analysis/tools/atools/astrometricRepeatability.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ def setDefaults(self):
109109
self.process.buildActions.residual.buildAction.buildAction = RAcosDec()
110110
self.process.buildActions.x = LoadVector(vectorKey="coord_ra")
111111
self.process.buildActions.y = LoadVector(vectorKey="coord_dec")
112+
self.process.buildActions.patch = LoadVector(vectorKey="patch")
112113

113114
self.produce = SkyPlot()
114115

python/lsst/analysis/tools/atools/astrometryWithReference.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ def setDefaults(self, coordinate):
165165
self.process.buildActions.xStars.vectorKey = "coord_ra_target"
166166
self.process.buildActions.yStars = LoadVector()
167167
self.process.buildActions.yStars.vectorKey = "coord_dec_target"
168+
self.process.buildActions.patch = LoadVector()
169+
self.process.buildActions.patch.vectorKey = "patch"
168170

169171
self.produce = SkyPlot()
170172
self.produce.plotTypes = ["stars"]

python/lsst/analysis/tools/atools/magDiff.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ def setDefaults(self):
5252
self.process.buildActions.xGalaxies.vectorKey = "coord_ra"
5353
self.process.buildActions.yGalaxies = LoadVector()
5454
self.process.buildActions.yGalaxies.vectorKey = "coord_dec"
55+
self.process.buildActions.patch = LoadVector()
56+
self.process.buildActions.patch.vectorKey = "patch"
5557
self.process.buildActions.galaxyStatMask = SnSelector()
5658
self.process.buildActions.galaxyStatMask.fluxType = "{band}_psfFlux"
5759

python/lsst/analysis/tools/atools/photometry.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def setDefaults(self):
5656
self.process.buildActions.xStars.vectorKey = "coord_ra"
5757
self.process.buildActions.yStars = LoadVector()
5858
self.process.buildActions.yStars.vectorKey = "coord_dec"
59+
self.process.buildActions.patch = LoadVector()
60+
self.process.buildActions.patch.vectorKey = "patch"
61+
5962
self.process.buildActions.starStatMask = SnSelector()
6063
self.process.buildActions.starStatMask.fluxType = "{band}_psfFlux"
6164

python/lsst/analysis/tools/atools/simpleDiaPlot.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def setDefaults(self):
3636
self.process.buildActions.ras.vectorKey = "ra"
3737
self.process.buildActions.decs = LoadVector()
3838
self.process.buildActions.decs.vectorKey = "decl"
39+
3940
# TODO: update column name to 'dec' once column names are standardized,
4041
# i.e., RFC-863
4142

python/lsst/analysis/tools/atools/skyObject.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,16 @@ def setDefaults(self):
4444
self.process.buildActions.statMask = SnSelector()
4545
self.process.buildActions.statMask.threshold = -1e12
4646
self.process.buildActions.statMask.fluxType = "{band}_psfFlux"
47+
self.process.buildActions.patch = LoadVector()
48+
self.process.buildActions.patch.vectorKey = "patch"
4749

4850
self.produce.plot = SkyPlot()
4951
self.produce.plot.plotTypes = ["any"]
5052
self.produce.plot.plotName = "skyObject_{band}"
5153
self.produce.plot.xAxisLabel = "R.A. (degrees)"
5254
self.produce.plot.yAxisLabel = "Dec. (degrees)"
5355
self.produce.plot.zAxisLabel = "Sky Object ap09Flux (nJy)"
54-
self.produce.plot.plotOutlines = False
56+
self.produce.plot.plotOutlines = True
5557
self.produce.plot.fixAroundZero = True
5658

5759

0 commit comments

Comments
 (0)