Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Commit

Permalink
Merge pull request #50 from willettk/decals_illustris
Browse files Browse the repository at this point in the history
Field names magnitude, size for new DECaLS and Illustris samples
  • Loading branch information
edpaget committed Sep 30, 2015
2 parents 49d5eff + dfd4ea5 commit c45b1af
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/models/InteractiveSubject.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class InteractiveSubject extends Spine.Model
@fromJSON: (json) =>
@lastFetch = new Array
for result in json
if result.recent.subjects[0]?.metadata?.survey is 'sloan' or result.recent.subjects[0]?.metadata?.survey is 'sloan_singleband'
if result.recent.subjects[0]?.metadata?.survey in ('sloan','sloan_singleband','decals')
item = @create
counters: result.recent.subjects[0].metadata.counters
classification: result.recent.user.classification
Expand All @@ -38,6 +38,18 @@ class InteractiveSubject extends Spine.Model
color: result.recent.subjects[0].metadata.mag?.u - result.recent.subjects[0].metadata.mag?.r
absolute_radius: result.recent.subjects[0].metadata.absolute_size

else if result.recent.subjects[0]?.metadata?.survey is 'illustris'
item = @create
counters: result.recent.subjects[0].metadata.counters
classification: result.recent.user.classification
image: result.recent.subjects[0].location.standard
zooniverse_id: result.recent.subjects[0].zooniverse_id
redshift: result.recent.subjects[0].metadata.redshift
absolute_brightness: result.recent.subjects[0].metadata.mag?.absmag_r
apparent_brightness: result.recent.subjects[0].metadata.mag?.absmag_r - 36.756
color: result.recent.subjects[0].metadata.mag?.absmag_u - result.recent.subjects[0].metadata.mag?.absmag_r
absolute_radius: result.recent.subjects[0].metadata.radius_half

else if result.recent.subjects[0]?.metadata?.survey is 'candels_2epoch'
item = @create
counters: result.recent.subjects[0].metadata.counters
Expand Down

0 comments on commit c45b1af

Please sign in to comment.