Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-39539: Rename fields to match new schema #123

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class MultiVisitCoveragePlot(PlotAction):
"zenithDistance": "deg",
"zeroPoint": "mag",
"ra": "deg",
"decl": "deg",
"dec": "deg",
"xFp": "mm",
"yFp": "mm",
"medianE": "",
Expand Down Expand Up @@ -118,7 +118,7 @@ class MultiVisitCoveragePlot(PlotAction):
"detector",
"band",
"ra",
"decl",
"dec",
"zeroPoint",
"psfSigma",
"skyBg",
Expand Down Expand Up @@ -341,7 +341,7 @@ def makePlot(
tractList: List[int] = []
elif self.projection == "raDec":
xKey = "ra"
yKey = "decl"
yKey = "dec"
xScatLen, yScatLen = 0, 0
# Use downselector without limits to get rid of any non-finite
# RA/Dec entries.
Expand All @@ -350,7 +350,7 @@ def makePlot(
tractList = self.tractsToPlotList
else:
ras = data["ra"]
decs = data["decl"]
decs = data["dec"]
tractList = list(set(skymap.findTractIdArray(ras, decs, degrees=True))) # type: ignore
log.info("List of tracts overlapping data: {}".format(tractList))
tractLimitsDict = self._getTractLimitsDict(skymap, tractList)
Expand All @@ -370,7 +370,7 @@ def makePlot(

if self.doScatterInRaDec:
raRange = max(cast(Vector, data["ra"])) - min(cast(Vector, data["ra"]))
decRange = max(cast(Vector, data["decl"])) - min(cast(Vector, data["decl"]))
decRange = max(cast(Vector, data["dec"])) - min(cast(Vector, data["dec"]))
scatRad = max(0.05 * max(raRange, decRange), 0.12) # min is of order of an LSSTCam detector
log.info("Scattering data in RA/Dec within radius {:.3f} (deg)".format(scatRad))

Expand Down Expand Up @@ -555,7 +555,7 @@ def makePlot(
)
if self.projection == "raDec":
raMin, raMax = min(cast(Vector, data["ra"])), max(cast(Vector, data["ra"]))
decMin, decMax = min(cast(Vector, data["decl"])), max(cast(Vector, data["decl"]))
decMin, decMax = min(cast(Vector, data["dec"])), max(cast(Vector, data["dec"]))
raMin, raMax, decMin, decMax = _setLimitsToEqualRatio(raMin, raMax, decMin, decMax)
pcm = plotProjectionWithBinning(
ax,
Expand Down Expand Up @@ -818,7 +818,7 @@ def _planeAreaSelector(
yMin=np.nextafter(float("-inf"), 0),
yMax=np.nextafter(float("inf"), 0),
xKey="ra",
yKey="decl",
yKey="dec",
):
"""Helper function for downselecting on within an area on a plane.

Expand Down Expand Up @@ -885,7 +885,7 @@ def _trimDataToTracts(self, data, skymap):
yMin=tractDecMin,
yMax=tractDecMax,
xKey="ra",
yKey="decl",
yKey="dec",
)
return downSelectedData

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/analysis/tools/atools/simpleDiaPlot.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def setDefaults(self):
self.process.buildActions.ras = LoadVector()
self.process.buildActions.ras.vectorKey = "ra"
self.process.buildActions.decs = LoadVector()
self.process.buildActions.decs.vectorKey = "decl"
self.process.buildActions.decs.vectorKey = "dec"
# TODO: update column name to 'dec' once column names are standardized,
# i.e., RFC-863

Expand Down