Skip to content

Commit

Permalink
Fix for 0h <-> 12h thing in some ACT plots
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattyowl
mattyowl committed May 11, 2024
1 parent b7ebdf8 commit e34ddb0
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 39 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/testing.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ jobs:
python-version: '3.10'
miniconda-version: "latest"
toxenv: py310-test-latest
- name: macOS 13
os: macos-13
label: osx-64
python-version: '3.12'
miniconda-version: "latest"
toxenv: py312-test-latest
# - name: macOS 13
# os: macos-13
# label: osx-64
# python-version: '3.12'
# miniconda-version: "latest"
# toxenv: py312-test-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
78 changes: 45 additions & 33 deletions astLib/astPlots.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Module for producing astronomical plots.
(c) 2007-2018 Matt Hilton
(c) 2007-2024 Matt Hilton
This module provides the matplotlib powered ImagePlot class, which is designed to be flexible.
ImagePlots can have RA, Dec. coordinate axes, contour overlays, and have objects marked in them,
Expand All @@ -12,7 +12,7 @@
from . import astImages
from . import astWCS
from . import astCoords
import numpy
import numpy as np
import astropy.io.fits as pyfits
from scipy import interpolate
import pylab
Expand Down Expand Up @@ -120,8 +120,8 @@ def __init__(self, imageData, imageWCS, axes = [0.1,0.1,0.8,0.8], \
needed (see L{RA_TICK_STEPS} and L{DEC_TICK_STEPS} for examples). If the coordinate axes are in
decimal format, the tick step size is specified simply in RA, dec decimal degrees.
@type imageData: numpy array or list
@param imageData: image data array or list of numpy arrays [r, g, b]
@type imageData: np array or list
@param imageData: image data array or list of np arrays [r, g, b]
@type imageWCS: astWCS.WCS
@param imageWCS: astWCS.WCS object
@type axes: list
Expand Down Expand Up @@ -166,7 +166,7 @@ def __init__(self, imageData, imageWCS, axes = [0.1,0.1,0.8,0.8], \
r=astImages.normalise(imageData[0], cutLevels[0])
g=astImages.normalise(imageData[1], cutLevels[1])
b=astImages.normalise(imageData[2], cutLevels[2])
rgb=numpy.array([r.transpose(), g.transpose(), b.transpose()])
rgb=np.array([r.transpose(), g.transpose(), b.transpose()])
rgb=rgb.transpose()
self.data=rgb
self.rgbImage=True
Expand Down Expand Up @@ -369,7 +369,7 @@ def addContourOverlay(self, contourImageData, contourWCS, tag, levels = ["linear
"""Adds image data to the ImagePlot as a contour overlay. The contours can be removed using
L{removeContourOverlay}. If a contour overlay already exists with this tag, it will be replaced.
@type contourImageData: numpy array
@type contourImageData: np array
@param contourImageData: image data array from which contours are to be generated
@type contourWCS: astWCS.WCS
@param contourWCS: astWCS.WCS object for the image to be contoured
Expand Down Expand Up @@ -458,9 +458,9 @@ def addPlotObjects(self, objRAs, objDecs, tag, symbol="circle", size=4.0, width=
draw(). If the ImagePlot already has a set of plotObjects with the same tag, they will be
replaced.
@type objRAs: numpy array or list
@type objRAs: np array or list
@param objRAs: object RA coords in decimal degrees
@type objDecs: numpy array or list
@type objDecs: np array or list
@param objDecs: corresponding object Dec. coords in decimal degrees
@type tag: string
@param tag: identifying tag for this set of objects
Expand Down Expand Up @@ -502,10 +502,10 @@ def addPlotObjects(self, objRAs, objDecs, tag, symbol="circle", size=4.0, width=
decInPlot.append(d)
labelInPlot.append(l)

xInPlot=numpy.array(xInPlot)
yInPlot=numpy.array(yInPlot)
RAInPlot=numpy.array(RAInPlot)
decInPlot=numpy.array(decInPlot)
xInPlot=np.array(xInPlot)
yInPlot=np.array(yInPlot)
RAInPlot=np.array(RAInPlot)
decInPlot=np.array(decInPlot)

# Size of symbols in pixels in plot - converted from arcsec
sizePix=(size/3600.0)/self.wcs.getPixelSizeDeg()
Expand Down Expand Up @@ -804,17 +804,17 @@ def calcWCSAxisLabels(self, axesLabels = "decimal"):
else:
raise Exception("axesLabels must be either 'sexagesimal' or 'decimal'")

# xArray=numpy.arange(0, self.data.shape[1], 1)
xArray=numpy.linspace(0, self.data.shape[1], self.data.shape[1]*2)
yArray=numpy.arange(0, self.data.shape[0], 1)
xWCS=self.wcs.pix2wcs(xArray, numpy.zeros(xArray.shape[0], dtype=float))
yWCS=self.wcs.pix2wcs(numpy.zeros(yArray.shape[0], dtype=float), yArray)
xWCS=numpy.array(xWCS)
yWCS=numpy.array(yWCS)
# xArray=np.arange(0, self.data.shape[1], 1)
xArray=np.linspace(0, self.data.shape[1], self.data.shape[1]*2)
yArray=np.arange(0, self.data.shape[0], 1)
xWCS=self.wcs.pix2wcs(xArray, np.zeros(xArray.shape[0], dtype=float))
yWCS=self.wcs.pix2wcs(np.zeros(yArray.shape[0], dtype=float), yArray)
xWCS=np.array(xWCS)
yWCS=np.array(yWCS)
ras=xWCS[:,0]
# ras[ras < 0]=ras[ras < 0]+360
decs=yWCS[:,1]
RAEdges=numpy.array([ras[0], ras[-1]])
RAEdges=np.array([ras[0], ras[-1]])
# RAMin=RAEdges.min()
# RAMax=RAEdges.max()
RAMin=ras.min()
Expand Down Expand Up @@ -850,7 +850,7 @@ def calcWCSAxisLabels(self, axesLabels = "decimal"):
RAPlotMin=RAPlotMin+RADegStep
if RAPlotMax >= RAMax:
RAPlotMax=RAPlotMax-RADegStep
RADegs=numpy.arange(RAPlotMin, RAPlotMax+0.0001, RADegStep)
RADegs=np.arange(RAPlotMin, RAPlotMax+0.0001, RADegStep)
else:
RAPlotMin=RADegStep*math.modf(RAMin/RADegStep)[1]
RAPlotMax=RADegStep*math.modf(RAMax/RADegStep)[1]
Expand All @@ -865,19 +865,19 @@ def calcWCSAxisLabels(self, axesLabels = "decimal"):
ra2x=interpolate.interp1d(ras[::-1], xArray[::-1], kind='linear')
else:
ra2x=interpolate.interp1d(ras, xArray, kind='linear')
RADegs=numpy.arange(RAPlotMin, RAPlotMax-360.0-0.0001, -RADegStep)
RADegs=np.arange(RAPlotMin, RAPlotMax-360.0-0.0001, -RADegStep)

# Full RA range?
if round(self.wcs.getXPixelSizeDeg()*self.wcs.header['NAXIS1']) == 360:
RADegs=numpy.arange(0, 360, RADegStep)
RADegs=np.arange(0, 360, RADegStep)

decPlotMin=decDegStep*math.modf(decMin/decDegStep)[1]
decPlotMax=decDegStep*math.modf(decMax/decDegStep)[1]
if decPlotMin < decMin:
decPlotMin=decPlotMin+decDegStep
if decPlotMax >= decMax:
decPlotMax=decPlotMax-decDegStep
decDegs=numpy.arange(decPlotMin, decPlotMax+0.0001, decDegStep)
decDegs=np.arange(decPlotMin, decPlotMax+0.0001, decDegStep)

if key == "major":
if axesLabels == "sexagesimal":
Expand Down Expand Up @@ -969,9 +969,21 @@ def calcWCSAxisLabels(self, axesLabels = "decimal"):
if key == 'minor':
RALabels=RALabels+RADegs.shape[0]*['']
decLabels=decLabels+decDegs.shape[0]*['']
RALocs=RALocs+ra2x(RADegs).tolist()

decLocs=decLocs+dec2y(decDegs).tolist()


# This is for avoiding 0h <-> 12h degeneracy that sometimes happens
RALocs=[]
RALocs=RALocs+ra2x(RADegs).tolist()
uniqRALocs=[]
uniqRALabels=[]
for i in range(len(RALocs)):
if RALocs[i] not in uniqRALocs:
uniqRALocs.append(RALocs[i])
uniqRALabels.append(RALabels[i])
RALocs=uniqRALocs
RALabels=uniqRALabels

self.ticsRA=[RALocs, RALabels]
self.ticsDec=[decLocs, decLabels]

Expand Down Expand Up @@ -1001,15 +1013,15 @@ def getTickSteps(self):
"""

# Aim for 5 major tick marks on a plot
xArray=numpy.arange(0, self.data.shape[1], 1)
yArray=numpy.arange(0, self.data.shape[0], 1)
xWCS=self.wcs.pix2wcs(xArray, numpy.zeros(xArray.shape[0], dtype=float))
yWCS=self.wcs.pix2wcs(numpy.zeros(yArray.shape[0], dtype=float), yArray)
xWCS=numpy.array(xWCS)
yWCS=numpy.array(yWCS)
xArray=np.arange(0, self.data.shape[1], 1)
yArray=np.arange(0, self.data.shape[0], 1)
xWCS=self.wcs.pix2wcs(xArray, np.zeros(xArray.shape[0], dtype=float))
yWCS=self.wcs.pix2wcs(np.zeros(yArray.shape[0], dtype=float), yArray)
xWCS=np.array(xWCS)
yWCS=np.array(yWCS)
ras=xWCS[:,0]
decs=yWCS[:,1]
RAEdges=numpy.array([ras[0], ras[-1]])
RAEdges=np.array([ras[0], ras[-1]])
RAMin=RAEdges.min()
RAMax=RAEdges.max()
decMin=decs.min()
Expand Down

0 comments on commit e34ddb0

Please sign in to comment.