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.

Sign up for GitHub

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

Added RACS and VAST Pilot surveys to Aladin #284

Merged
merged 5 commits into from
Sep 17, 2020
Merged

Added RACS and VAST Pilot surveys to Aladin #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7b23d3
Added RACS and VAST surveys to Aladin
ajstewart Aug 25, 2020
fdc8939
Added Epoch 12 and Stokes V HiPS
ajstewart Sep 17, 2020
6d0eaf7
Merge branch 'master' into update-aladin-surveys
ajstewart Sep 17, 2020
2b60fdf
Increased Aladin zoom slightly
ajstewart Sep 17, 2020
45ff1d9
Fixed Stokes V variable names
ajstewart Sep 17, 2020
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
4 changes: 2 additions & 2 deletions pipeline/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ def MeasurementDetail(request, id, action=None):

measurement['aladin_ra'] = measurement['ra']
measurement['aladin_dec'] = measurement['dec']
measurement['aladin_zoom'] = 0.36
measurement['aladin_zoom'] = 0.15
measurement['ra'] = deg2hms(measurement['ra'], hms_format=True)
measurement['dec'] = deg2dms(measurement['dec'], dms_format=True)

Expand Down Expand Up @@ -705,7 +705,7 @@ def SourceDetail(request, id, action=None):
)
source['aladin_ra'] = source['wavg_ra']
source['aladin_dec'] = source['wavg_dec']
source['aladin_zoom'] = 0.36
source['aladin_zoom'] = 0.15
source['wavg_ra'] = deg2hms(source['wavg_ra'], hms_format=True)
source['wavg_dec'] = deg2dms(source['wavg_dec'], dms_format=True)

Expand Down
76 changes: 75 additions & 1 deletion static/js/aladin-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,81 @@ aladin.setZoom(aladinConf.aladin_zoom);
aladin.gotoPosition(aladinConf.aladin_ra , aladinConf.aladin_dec);
var sumss = aladin.createImageSurvey('SUMSS', 'SUMSS', 'https://alasky.u-strasbg.fr/SUMSS', 'equatorial', 6, {imgFormat: 'png'});
var nvss = aladin.createImageSurvey('NVSS', 'NVSS', 'https://alasky.u-strasbg.fr/NVSS/intensity/', 'equatorial', 5, {imgFormat: 'jpg'});
let survey = (aladinConf.aladin_dec < -40) ? sumss : nvss;
var racs = aladin.createImageSurvey('RACS', 'RACS', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/RACS_I1/', 'equatorial', 8, {imgFormat: 'png'});
var vast_epoch_01 = aladin.createImageSurvey(
'VAST Pilot 1', 'VAST Pilot 1', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST1_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_01_v = aladin.createImageSurvey(
'VAST Pilot 1 (Stokes V)', 'VAST Pilot 1 (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST1_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_02 = aladin.createImageSurvey(
'VAST Pilot 2', 'VAST Pilot 2', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST2_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_02_v = aladin.createImageSurvey(
'VAST Pilot 2 (Stokes V)', 'VAST Pilot 2 (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST2_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_03x = aladin.createImageSurvey(
'VAST Pilot 3x', 'VAST Pilot 3x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST3x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_03x_v = aladin.createImageSurvey(
'VAST Pilot 3x (Stokes V)', 'VAST Pilot 3x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST3x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_04x = aladin.createImageSurvey(
'VAST Pilot 4x', 'VAST Pilot 4x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST4x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_04x_v = aladin.createImageSurvey(
'VAST Pilot 4x (Stokes V)', 'VAST Pilot 4x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST4x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_05x = aladin.createImageSurvey(
'VAST Pilot 5x', 'VAST Pilot 5x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST5x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_05x_v = aladin.createImageSurvey(
'VAST Pilot 5x (Stokes V)', 'VAST Pilot 5x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST5x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_06x = aladin.createImageSurvey(
'VAST Pilot 6x', 'VAST Pilot 6x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST6x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_06x_v = aladin.createImageSurvey(
'VAST Pilot 6x (Stokes V)', 'VAST Pilot 6x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST6x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_07x = aladin.createImageSurvey(
'VAST Pilot 7x', 'VAST Pilot 7x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST7x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_07x_v = aladin.createImageSurvey(
'VAST Pilot 7x (Stokes V)', 'VAST Pilot 7x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST7x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_08 = aladin.createImageSurvey(
'VAST Pilot 8', 'VAST Pilot 8', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST8_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_08_v = aladin.createImageSurvey(
'VAST Pilot 8 (Stokes V)', 'VAST Pilot 8 (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST8_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_09 = aladin.createImageSurvey(
'VAST Pilot 9', 'VAST Pilot 9', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST9_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_09_v = aladin.createImageSurvey(
'VAST Pilot 9 (Stokes V)', 'VAST Pilot 9 (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST9_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_10x = aladin.createImageSurvey(
'VAST Pilot 10x', 'VAST Pilot 10x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST10x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_10x_v = aladin.createImageSurvey(
'VAST Pilot 10x (Stokes V)', 'VAST Pilot 10x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST10x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_11x = aladin.createImageSurvey(
'VAST Pilot 11x', 'VAST Pilot 11x', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST11x_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_11x_v = aladin.createImageSurvey(
'VAST Pilot 11x (Stokes V)', 'VAST Pilot 11x (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST11x_V4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_12 = aladin.createImageSurvey(
'VAST Pilot 12', 'VAST Pilot 12', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST12_I4', 'equatorial', 6, {imgFormat: 'png'}
);
var vast_epoch_12_v = aladin.createImageSurvey(
'VAST Pilot 12 (Stokes V)', 'VAST Pilot 12 (Stokes V)', 'https://www.atnf.csiro.au/people/Emil.Lenc/HiPS/VAST12_V4', 'equatorial', 6, {imgFormat: 'png'}
);

let survey = racs;
aladin.setImageSurvey(survey);
aladin.getBaseImageLayer().getColorMap().reverse();
if (aladinConf.hasOwnProperty('aladin_box_ra')) {
Expand Down