Skip to content

Commit 3ae96cc

Browse files
author
Luisa Rebull
committed
further changes as per discussion in #25 (review)
1 parent 4852d57 commit 3ae96cc

File tree

2 files changed

+75
-20
lines changed

2 files changed

+75
-20
lines changed

app/src/toc/firefly_toc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,11 @@ const toc_catalogs = {
387387
href: 'firefly/catalogs.html#tapSearches.adql',
388388
hidden: true,
389389
},
390+
{
391+
id: 'catalogs.interacting',
392+
title: 'Interacting',
393+
href: 'firefly/catalogs.html#interacting',
394+
},
390395
]
391396
};
392397

html/firefly/catalogs.html

Lines changed: 70 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ <h3><a name="catalogs">Catalogs</A></h3>
2525
catalog, you can <a href="plots.html">make plots</A>. <P>
2626

2727
<em>Contents of page/chapter:</em><br>
28-
+<A href="#irsacatalogs">IRSA Catalogs</A> -- Overlaying catalogs
29-
from IRSA<br>
30-
+<A href="#nedcatalogs">NED Objects</A> <br>
31-
+<A href="#owncatalogs">Catalogs from Disk</A> <br>
32-
+<A href="#votap">VO TAP Search</A><br>
33-
+<A href="#voscs">VO SCS Search</A> <br>
28+
+<A href="#irsacatalogs">IRSA Catalogs</A> -- Searching for catalogs from IRSA<br>
29+
+<A href="#nedcatalogs">NED Objects</A> -- Searching for NED objects <br>
30+
+<A href="#owncatalogs">Catalogs from Disk</A> -- Loading catalogs from disk <br>
31+
+<A href="#votap">VO TAP Search</A> -- Searching for catalogs via VO TAP services <br>
32+
+<A href="#voscs">VO SCS Search</A> -- Searching for catalogs via VO SCS services <br>
33+
+<A href="#interacting">Interacting</A> -- Interacting with catalogs<br>
3434
<P>&nbsp;<P>
3535

3636

3737

38-
<h3><a name="irsacatalogs"><a name="catalogs">IRSA Catalogs</A></A></h3>
38+
<h3><a name="irsacatalogs"><a name="catalogs">IRSA Catalogs</A></A> -- Searching for catalogs from IRSA</h3>
3939

4040
By clicking on the blue "Catalog" tab (which also looks like a
4141
button), a window appears with several options, as follows. By
@@ -212,37 +212,50 @@ <h3><a name="irsacatalogs"><a name="catalogs">IRSA Catalogs</A></A></h3>
212212

213213
</ul><P>
214214

215+
The search results are then shown and <a
216+
href="#interacting">interacted with</A> in the same way as the other
217+
catalogs described here.<P>
215218

216-
<h3><A name="nedcatalogs">NED Objects</A> -- Overlaying
217-
objects obtained from NED</h3>
219+
220+
<h3><A name="nedcatalogs">NED Objects</A> -- Searching for NED objects</h3>
218221

219222
(NED= <A href="http://ned.ipac.caltech.edu/" target="_blank">NASA
220223
Extragalactic Database <img src="img/jumpout.jpg" height="10"></A>.)<P>
221224

222225
By clicking on the blue "Catalogs" tab, you are by default dropped
223226
into the interface for searching for catalogs at IRSA. However, you
224227
can pick another tab, "NED", to search for and load objects from
225-
NED.<P>
228+
a cone search at NED.<P>
226229

227230
<img src="img/nedcat.png" width="75%"><P>
228231

229-
230232
As for the other catalog searches, the tool pre-fills the target
231-
position with its best guess o the coordinates of the target with
232-
which you have been working. In this case, you are limited to a cone
233+
position with its best guess of the coordinates of the target with
234+
which you have been working. You can use an object name in place of
235+
coordinates. Note that although NED is used for name resolution, the
236+
actual search is then performed using coordinates, as opposed to name.
237+
In this case, you are limited to a cone
233238
search, so the next option is the cone search radius. Pick your units
234239
from the pulldown first, and then enter a number; if you enter a
235240
number and then select from the pulldown, it will convert your number
236241
from the old units to the new units. There are both upper and lower
237242
limits to your search radius; it will tell you if you request
238243
something too big or too small. <P>
239244

245+
From the NED results, you have one-click access to the fully detailed
246+
information from NED on any object returned from such a search.
247+
The search results will generally include a column "Details", though
248+
you may have to scroll to the right to see it. Clicking on a link in
249+
this column takes you directly to the full NED information display for
250+
the selected object in a new window.
251+
<P>
240252

241-
The search results are then shown (and interacted with) in the same
242-
way as the other catalogs described here.<P>
253+
The search results are then shown and <a
254+
href="#interacting">interacted with</A> in the same way as the other
255+
catalogs described here.<P>
243256

244257

245-
<h3><a name="owncatalogs">Loading your own catalogs</A></h3><P>
258+
<h3><a name="owncatalogs">Loading your own catalogs from disk</A></h3><P>
246259

247260
By clicking on the blue "Catalogs" tab, you are by default dropped
248261
into the interface for searching for catalogs at IRSA. However, you
@@ -385,10 +398,16 @@ <h3><a name="owncatalogs">Loading your own catalogs</A></h3><P>
385398
then come back to the the "Load catalog file" tab to pick another HDU
386399
without having to upload it again.
387400
</UL>
401+
<P>
402+
403+
The search results are then shown and <a
404+
href="#interacting">interacted with</A> in the same way as the other
405+
catalogs described here.<P>
406+
388407

389408

390409
<a name="tapSearches.form"></A>
391-
<h3><A name="votap">VO TAP Search</A></h3>
410+
<h3><A name="votap">VO TAP Search</A> -- Searching for catalogs via VO TAP services</h3>
392411

393412
(VO= <A href="http://www.virtualobservatory.org/"
394413
target="_blank">Virtual Observatory <img src="img/jumpout.jpg"
@@ -623,10 +642,15 @@ <h3><A name="votap">VO TAP Search</A></h3>
623642

624643
</dl><P>
625644

645+
The search results are then shown and <a
646+
href="#interacting">interacted with</A> in the same way as the other
647+
catalogs described here.<P>
648+
649+
626650

627651

628652

629-
<h3><A name="voscs">VO SCS Search</A></h3>
653+
<h3><A name="voscs">VO SCS Search</A> -- Searching for catalogs via VO SCS services</h3>
630654

631655

632656
(VO= <A href="http://www.virtualobservatory.org/" target="_blank">Virtual
@@ -702,9 +726,35 @@ <h3><A name="voscs">VO SCS Search</A></h3>
702726

703727
</UL><P>
704728

729+
The search results are then shown and <a
730+
href="#interacting">interacted with</A> in the same way as the other
731+
catalogs described here.<P>
732+
733+
734+
735+
<h3><A name="interacting">Interacting with catalogs</A></h3>
736+
737+
When you load a catalog, the tools may create a table, a plot, and/or,
738+
if your catalog has position information (e.g., RA and dec), it
739+
overlays the catalog on an image. All three of these ways of
740+
displaying the catalog are interlinked and interactive.<P>
741+
742+
Catalogs are a special case of <a href="tables.html">tables</A>; the
743+
basic functionality of tables is covered in the <a
744+
href="tables.html">Tables section</A>. You can sort and filter the
745+
table.<P>
746+
747+
<A href="plots.html">Plots</A> are also covered in a different
748+
section. You can make scatter plots, heat maps, and histograms. You
749+
can plot columns from your catalog, including simple mathematical
750+
manipulations of catalog columns.<P>
751+
752+
If your catalog has positions included and your tool has an image
753+
display, your catalog will also be overlaid on an image. The <a
754+
href="visualization.html">Visualization section</A> includes
755+
information about that. Each catalog that you load is overlaid on
756+
the image using different, customizable symbols and colors. <P>
705757

706-
</BODY>
707-
</HTML>
708758

709759

710760

0 commit comments

Comments
 (0)