Skip to content

Commit aba097a

Browse files
committed
use hms/dms format for plot axes
1 parent e80e7e8 commit aba097a

File tree

2 files changed

+42
-5
lines changed

2 files changed

+42
-5
lines changed

robbie_viewer_server/main.py

+39
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from astropy.io import fits
44
from astropy.io.votable import parse
55
from astropy.wcs import WCS
6+
from astropy.coordinates import Angle
7+
import astropy.units as u
68
import numpy as np
79
import glob
810
import pandas as pd
@@ -15,6 +17,7 @@
1517
from bokeh.layouts import layout
1618
from bokeh.io import curdoc
1719
from bokeh.models import ColumnDataSource, Circle, CustomJS
20+
from bokeh.models.formatters import FuncTickFormatter
1821
from utils import get_joined_table_source, get_scatter_plots, get_mean_image_plot,\
1922
get_light_curve_plot, get_light_curve_plot, get_epoch_image_plots, load_mean_image, mean_image_data, get_imdata
2023

@@ -69,6 +72,42 @@
6972
sky.x_range = mean_image.x_range = epochs.x_range
7073
sky.y_range = mean_image.y_range = epochs.y_range
7174

75+
# make the plot coords be in hms/dms format
76+
dms = """
77+
var s = Math.sign(tick);
78+
var t = Math.abs(tick);
79+
var deg = Math.floor(t);
80+
t = (t -deg)*60;
81+
var min = Math.floor(t);
82+
t = (t-min)*60;
83+
var sec = Math.floor(t);
84+
var tk = ""
85+
if (s < 0) {
86+
tk = String(s)[0]
87+
}
88+
tk = tk + String(deg).padStart(2,'0') + ":"+String(min).padStart(2,'0')+":"+String(sec).padStart(2,'0');
89+
return tk;
90+
"""
91+
hms = """
92+
var s = Math.sign(tick);
93+
var t = Math.abs(tick/15);
94+
var deg = Math.floor(t);
95+
t = (t -deg)*60;
96+
var min = Math.floor(t);
97+
t = (t-min)*60;
98+
var sec = Math.floor(t);
99+
var tk = ""
100+
if (s < 0) {
101+
tk = String(s)[0]
102+
}
103+
tk = tk + String(deg).padStart(2,'0') + ":"+String(min).padStart(2,'0')+":"+String(sec).padStart(2,'0');
104+
return tk;
105+
"""
106+
107+
sky.yaxis.formatter = mean_image.yaxis.formatter = epochs.yaxis.formatter = FuncTickFormatter(code=dms)
108+
sky.xaxis.formatter = mean_image.xaxis.formatter = epochs.xaxis.formatter = FuncTickFormatter(code=hms)
109+
110+
72111
# # Callback to update epochs
73112
# def update_epochs():
74113

robbie_viewer_server/utils.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def get_scatter_plots(source):
139139
left = figure(
140140
tools=TOOLS,
141141
title='Sky Plot',
142-
x_axis_label='RA (deg)', y_axis_label='DEC (deg)',
142+
x_axis_label='RA (hour)', y_axis_label='DEC (deg)',
143143
x_range=(0,1),
144144
y_range=(0,1),
145145
)
@@ -186,8 +186,7 @@ def get_mean_image_plot(source, result_dir, ra_ref=None, dec_ref=None, degrees_a
186186
("RA", "$x{0.00}°"),
187187
("DEC", "$y{0.00}°")
188188
],
189-
x_axis_label='RA',
190-
y_axis_label='DEC',
189+
x_axis_label='RA (hour)', y_axis_label='DEC (deg)',
191190
x_range=(min(source.data['ref_ra']), max(source.data['ref_ra'])),
192191
y_range=(min(source.data['ref_dec']), max(source.data['ref_dec'])),
193192
)
@@ -218,8 +217,7 @@ def get_epoch_image_plots(epoch_files, mean_source, ra_ref=None, dec_ref=None, d
218217
("RA", "$x{0.00}°"),
219218
("DEC", "$y{0.00}°")
220219
],
221-
x_axis_label='RA',
222-
y_axis_label='DEC',
220+
x_axis_label='RA (hour)', y_axis_label='DEC (deg)',
223221
x_range=(min(mean_source.data['ref_ra']), max(mean_source.data['ref_ra'])),
224222
y_range=(min(mean_source.data['ref_dec']), max(mean_source.data['ref_dec'])),
225223
)

0 commit comments

Comments
 (0)