Skip to content

Commit 4ad16a2

Browse files
authored
Merge pull request #37 from Erard/master
Some editorial updates
2 parents c744d09 + f276667 commit 4ad16a2

File tree

3 files changed

+36
-26
lines changed

3 files changed

+36
-26
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
test -f ${{ env.doc_name }}.bbl
4040
4141
- name: Keep the PDF artefact
42-
uses: actions/upload-artifact@v1
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: PDF Preview
4545
path: ${{ env.doc_name }}.pdf

EPNTAP.tex

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ \subsection{EPN-TAP rules applying to table structure and parameter usage}
302302
Whenever possible, this refers to IVOA vocabularies maintained independently.
303303

304304
\item Internal spaces are supported in string parameters values, but
305-
not leading or trailing spaces.
305+
leading or trailing spaces are not.
306306

307307
\item Special characters, quotes, and hash are not allowed in string parameter values,
308308
and may be changed to \_ (underscore, which is the single-character
@@ -713,10 +713,15 @@ \subsubsection{Target description}
713713
\item Consortia such as the IGSN\footnote{\url{https://www.igsn.org}}
714714
issue IDs for samples
715715

716-
\item Asteroids: Usage is to use preferably name (if it exists) or
716+
\item Asteroids: Usage is to use preferably the name (if it exists) or
717717
principal designation (the number is not used here, it can be included
718718
in alt\_target\_name)
719719

720+
\item Comets: Usage is to use preferably the code and principal designation, e.g.,
721+
P/2022 C2 or 1P for periodic comets, C/2022 E3 for non-periodic ones
722+
(discoverer names are ambiguous and can be included
723+
in alt\_target\_name)
724+
720725
\item Meteors: the IAU Meteor Data Center assigns IDs to meteors and
721726
meteor showers
722727

@@ -738,7 +743,7 @@ \subsubsection{Target description}
738743

739744
Will return data only from 1 Ceres or 4 Vesta.
740745

741-
The LIKE operator is used here to handle cases when 1) the name includes a
746+
The LIKE operator is used in this example to handle cases when 1) the name includes a
742747
number, either `1 Ceres' or `(1) Ceres', which (although not recommended)
743748
may occur in some services, 2) the special case of dwarf planets, which
744749
may be tagged as asteroids, or as `dwarf\_planet\#asteroid' (recommended,
@@ -1245,10 +1250,12 @@ \subsubsection{Data origin}
12451250

12461251
This parameter provides the name of the observatory, spacecraft, or
12471252
facility that performed the measurements. A hash-separated-list of host
1248-
names must be provided for integrated data sets. In the EPNCore table, the
1249-
acronym is preferred to the full name to avoid long strings and related
1250-
errors (however, both values can be provided in the list). An observatory list
1251-
is being developed in Europlanet 2024/VESPA and by merging various sources.
1253+
names must be provided for integrated data sets. In the EPNCore table, usual
1254+
acronyms are preferred to full names to avoid long strings and related
1255+
errors (however, both values can be provided in the list). As a rule of thumb,
1256+
instrument\_host\_name implies a location, and several levels can be
1257+
provided together when relevant, e.g., space\_mission\#spacecraft or observatory\#telescope.
1258+
The second value is recommended as it is more specific.
12521259
For lab measurements, this is typically the name of the facility.
12531260

12541261
\textbf{\\}
@@ -1293,14 +1300,16 @@ \subsubsection{Data origin}
12931300
Identifies the instrument(s) that acquired the data.
12941301
A hash-separated-list of instruments must be provided
12951302
for integrated data products.
1296-
Service providers are invited to include multiple values
1303+
Service providers should include multiple values
12971304
for instrument name, e.g., complete name and usual acronym.
12981305
This will allow queries on either
12991306
``Visible Infrared Thermal Imaging Spectrometer'' or ``VIRTIS''
1300-
to produce the same reply. For ground-based observations and lab
1301-
measurements, this is typically the name of the instrument in use (not
1307+
to produce the same reply.
1308+
As a rule of thumb, instrument\_name implies one or more coverages
1309+
(spatial, spectral, etc): for ground-based observations and lab measurements,
1310+
this is typically the name of the instrument in use (not
13021311
the telescope or facility). Non-compulsory parameters are available to
1303-
provide more information about sensors, instrument modes, etc.
1312+
provide more information about sensors, channels, instrument modes, etc.
13041313

13051314
\textbf{\\}
13061315
\emph{Example}:
@@ -1429,7 +1438,7 @@ \subsubsection{Miscellaneous file metadata}
14291438
user. EPN-TAP clients such as the VESPA portal use this thumbnail for
14301439
an on-line quick-look. It therefore contributes significantly to a
14311440
service's accessibility.
1432-
Preferred formats include jpeg and png, which are handled easily
1441+
Recommended formats include jpeg and png, which are handled easily
14331442
in a web browser. Larger or more elaborate previews must be provided as
14341443
independent granules and identified via a granule\_gid different from
14351444
the data.
@@ -1568,9 +1577,9 @@ \subsubsection{Supplementary description}
15681577
and accurate ID. This VO service provides an extended list of references:
15691578
\url{http://svo2.cab.inta-csic.es/svo/theory/fps3/}
15701579

1571-
This is intended to document the results of a search, rather than
1572-
a search parameter. Therefore, it is recommended to also fill the
1573-
spectral\_range\_min/max parameters to describe filter imaging --- this
1580+
This parameter is intended to document the results of a search, rather than
1581+
a search parameter. Therefore, it is recommended to also provide the bandwidth
1582+
via the spectral\_range\_min/max parameters --- this
15741583
is the only way to make filter imaging easily searchable.
15751584

15761585
\paragraph{alt\_target\_name}
@@ -1588,24 +1597,25 @@ \subsubsection{Supplementary description}
15881597
\label{par:feature_name}
15891598

15901599
Introduces a supplementary name to provide more details
1591-
about the observed target. It is intended in particular to
1600+
about the observed target. It is intended to
15921601
accommodate a local name (crater, surface feature, region…)
15931602
whereas target\_name is reserved to identify the whole body
15941603
(Mars, Moon, Ceres…). Use of official features names defined by IAU
15951604
(\url{http://planetarynames.wr.usgs.gov/})
1596-
is preferred when relevant.
1605+
is recommended when relevant.
15971606

15981607
\paragraph{target\_region}
15991608

16001609
Specifies a \emph{type} of region on the target. This parameter
1601-
only introduces generic regions (e.g., atmospheric layer, internal
1610+
only introduces generic regions (e.g., atmospheric layer, internal
16021611
structure…), not specific local names which must be handled using the
16031612
feature\_name parameter.
16041613

1605-
Values are best selected from the IVOA
1614+
Values should be selected from the IVOA
16061615
rendition of the Unified Astronomy Thesaurus:
16071616
\url{http://www.ivoa.net/rdf/uat}
16081617

1618+
The UAT can be completed with new values if required.
16091619
Older sources (some of them may be integrated in the UAT) include:
16101620

16111621
\begin{itemize}
@@ -1714,7 +1724,7 @@ \subsubsection{Description of coordinate frame}
17141724
Services using different time scales must declare them in this column
17151725
using identifiers from the IVOA timescale
17161726
vocabulary\footnote{\url{http://www.ivoa.net/rdf/timescale}}, amending
1717-
that if necessary.
1727+
that if necessary. The typical time scale for predicted events is TDB.
17181728

17191729
Both time\_scale and time\_refposition can be used to feed the TIMESYS
17201730
element of VOTable 1.4 when their values are constant throughout the
@@ -1998,7 +2008,7 @@ \subsubsection{Contributive works}
19982008

19992009
\paragraph{observer\_institute, observer\_country}
20002010

2001-
Provide the affiliation and country of residence of the observer, as free text. The later is mostly intended for amateur or pro-am contributions.
2011+
Provide the affiliation and country of residence of the observer. Use of ISO 3166 country codes is recommended. This is mostly intended for amateur or pro-am contributions.
20022012

20032013
\paragraph{observer\_location, observer\_lon, observer\_lat}
20042014

@@ -2289,8 +2299,8 @@ \section{EPNCore Table}
22892299
processing\_level&Integer&&Dataset-related encoding, or simplified CODMAC calibration level&\ucd{meta.calibLevel}\\
22902300
target\_name&Text&&Standard IAU name of target (must match target\_class), case sensitive.&\ucd{meta.id;src}\\
22912301
\textbf{target\_class}&Text&&Type of target, from enumerated list&\ucd{src.class}\\
2292-
time\_min&Double&d&Start time (in JD). UTC measured at time\_origin location (default is observer's frame)&\ucd{time.start;obs}\\
2293-
time\_max&Double&d&Stop time (in JD). UTC measured at time\_origin location (default is observer's frame)&\ucd{time.end;obs}\\
2302+
time\_min&Double&d&Start time (in JD). UTC measured at time\_refposition location (default is observer's frame)&\ucd{time.start;obs}\\
2303+
time\_max&Double&d&Stop time (in JD). UTC measured at time\_refposition location (default is observer's frame)&\ucd{time.end;obs}\\
22942304
time\_sampling\_step\_min&Float&s&Min time sampling step&\ucd{time.resolution;stat.min}\\
22952305
time\_sampling\_step\_max&Float&s&Max time sampling step&\ucd{time.resolution;stat.max}\\
22962306
time\_exp\_min&Float&s&Min integration time&\ucd{time.duration;obs.exposure;stat.min}\\
@@ -2335,7 +2345,7 @@ \section{EPNCore Table}
23352345
thumbnail\_url&Text&&URL of a thumbnail image with predefined size (png ~200 pix, for use in a client only)&\ucd{meta.ref.url;meta.preview}\\
23362346
file\_name&Text&&Name of the data file only, case sensitive&\ucd{meta.id;meta.file}\\
23372347
datalink\_url&Text&&Provides links to files or services on the server&\ucd{meta.ref.url}\\
2338-
bib\_reference&Text&&Bibcode or doi preferred; can be a URL or anything else. Refers to the \emph{granule}&\ucd{meta.bib}\\
2348+
bib\_reference&Text&&Bibcode or doi recommended; can be a URL or anything else. Refers to the \emph{granule}&\ucd{meta.bib}\\
23392349
publisher&Text&&Resource publisher&\ucd{meta.curation}\\
23402350
processing\_level\_desc&Text&&Describes specificities of the processing level&\ucd{meta.note}\\
23412351
internal\_reference&Text&&Related granule\_uid(s) in the current service&\ucd{meta.id.cross}\\

0 commit comments

Comments
 (0)