Skip to content

Commit f1fa7d1

Browse files
bkhelifibkhelifi
authored
Merge pull request #26 from bkhelifi/fields]
Comments on the extension fields
2 parents 98faad8 + 9410c99 commit f1fa7d1

6 files changed

Lines changed: 37 additions & 32 deletions

File tree

‎HighEnergyObsCoreExt.glg‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
This is makeindex, version 2.15 [TeX Live 2022/dev] (kpathsea + Thai support).
22
Scanning style file ./HighEnergyObsCoreExt.ist.............................done (29 attributes redefined, 0 ignored).
3-
Scanning input file HighEnergyObsCoreExt.glo....done (93 entries accepted, 0 rejected).
4-
Sorting entries....done (660 comparisons).
5-
Generating output file HighEnergyObsCoreExt.gls....done (45 lines written, 0 warnings).
3+
Scanning input file HighEnergyObsCoreExt.glo....done (121 entries accepted, 0 rejected).
4+
Sorting entries....done (925 comparisons).
5+
Generating output file HighEnergyObsCoreExt.gls....done (52 lines written, 0 warnings).
66
Output written in HighEnergyObsCoreExt.gls.
77
Transcript written in HighEnergyObsCoreExt.glg.

‎HighEnergyObsCoreExt.gls‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,49 @@
44
\glossentry{GTI}{\glossaryentrynumbers{\relax
55
\setentrycounter[]{page}\glsnumberformat{15}}}\glsgroupskip
66
\glsgroupheading{H}\relax \glsresetentrylist %
7-
\glossentry{HE}{\glossaryentrynumbers{\relax
8-
\setentrycounter[]{page}\glsnumberformat{4\delimN 5}\delimN
9-
\setentrycounter[]{page}\glsnumberformat{19}\delimN
10-
\setentrycounter[]{page}\glsnumberformat{23\delimR 25}\delimN
11-
\setentrycounter[]{page}\glsnumberformat{32}}}%
127
\glossentry{HEA}{\glossaryentrynumbers{\relax
138
\setentrycounter[]{page}\glsnumberformat{1}\delimN
14-
\setentrycounter[]{page}\glsnumberformat{4\delimR 11}\delimN
15-
\setentrycounter[]{page}\glsnumberformat{13\delimR 18}\delimN
16-
\setentrycounter[]{page}\glsnumberformat{22\delimN 23}}}%
9+
\setentrycounter[]{page}\glsnumberformat{5\delimR 11}\delimN
10+
\setentrycounter[]{page}\glsnumberformat{13\delimR 19}\delimN
11+
\setentrycounter[]{page}\glsnumberformat{21}\delimN
12+
\setentrycounter[]{page}\glsnumberformat{23\delimR 25}\delimN
13+
\setentrycounter[]{page}\glsnumberformat{28\delimN 29}\delimN
14+
\setentrycounter[]{page}\glsnumberformat{32}\delimN
15+
\setentrycounter[]{page}\glsnumberformat{41}}}%
1716
\glossentry{HEIG}{\glossaryentrynumbers{\relax
18-
\setentrycounter[]{page}\glsnumberformat{4}}}\glsgroupskip
17+
\setentrycounter[]{page}\glsnumberformat{5}\delimN
18+
\setentrycounter[]{page}\glsnumberformat{41}}}\glsgroupskip
1919
\glsgroupheading{I}\relax \glsresetentrylist %
20+
\glossentry{IACT}{\glossaryentrynumbers{\relax
21+
\setentrycounter[]{page}\glsnumberformat{17\delimN 18}}}%
2022
\glossentry{IRF}{\glossaryentrynumbers{\relax
21-
\setentrycounter[]{page}\glsnumberformat{6}\delimN
22-
\setentrycounter[]{page}\glsnumberformat{8\delimN 9}\delimN
23+
\setentrycounter[]{page}\glsnumberformat{3\delimN 4}\delimN
24+
\setentrycounter[]{page}\glsnumberformat{6\delimR 9}\delimN
2325
\setentrycounter[]{page}\glsnumberformat{11}\delimN
24-
\setentrycounter[]{page}\glsnumberformat{17\delimR 19}}}%
26+
\setentrycounter[]{page}\glsnumberformat{18\delimR 20}\delimN
27+
\setentrycounter[]{page}\glsnumberformat{33}\delimN
28+
\setentrycounter[]{page}\glsnumberformat{35\delimR 37}}}%
2529
\glossentry{IVOA}{\glossaryentrynumbers{\relax
26-
\setentrycounter[]{page}\glsnumberformat{4}\delimN
27-
\setentrycounter[]{page}\glsnumberformat{6\delimN 7}\delimN
28-
\setentrycounter[]{page}\glsnumberformat{18}\delimN
29-
\setentrycounter[]{page}\glsnumberformat{32}}}\glsgroupskip
30+
\setentrycounter[]{page}\glsnumberformat{5}\delimN
31+
\setentrycounter[]{page}\glsnumberformat{7\delimN 8}\delimN
32+
\setentrycounter[]{page}\glsnumberformat{19}\delimN
33+
\setentrycounter[]{page}\glsnumberformat{41}}}\glsgroupskip
3034
\glsgroupheading{M}\relax \glsresetentrylist %
3135
\glossentry{MOC}{\glossaryentrynumbers{\relax
32-
\setentrycounter[]{page}\glsnumberformat{15}}}\glsgroupskip
36+
\setentrycounter[]{page}\glsnumberformat{16}}}\glsgroupskip
3337
\glsgroupheading{S}\relax \glsresetentrylist %
3438
\glossentry{STI}{\glossaryentrynumbers{\relax
3539
\setentrycounter[]{page}\glsnumberformat{15}}}\glsgroupskip
3640
\glsgroupheading{U}\relax \glsresetentrylist %
3741
\glossentry{UHE}{\glossaryentrynumbers{\relax
38-
\setentrycounter[]{page}\glsnumberformat{24}}}\glsgroupskip
42+
\setentrycounter[]{page}\glsnumberformat{25}}}\glsgroupskip
3943
\glsgroupheading{V}\relax \glsresetentrylist %
4044
\glossentry{VHE}{\glossaryentrynumbers{\relax
41-
\setentrycounter[]{page}\glsnumberformat{24}}}%
45+
\setentrycounter[]{page}\glsnumberformat{25}}}%
4246
\glossentry{VO}{\glossaryentrynumbers{\relax
43-
\setentrycounter[]{page}\glsnumberformat{4}\delimN
44-
\setentrycounter[]{page}\glsnumberformat{6}}}%
47+
\setentrycounter[]{page}\glsnumberformat{4\delimN 5}\delimN
48+
\setentrycounter[]{page}\glsnumberformat{7}}}\glsgroupskip
49+
\glsgroupheading{W}\relax \glsresetentrylist %
50+
\glossentry{WCD}{\glossaryentrynumbers{\relax
51+
\setentrycounter[]{page}\glsnumberformat{18}}}%
4552
\end{theglossary}\glossarypostamble

‎HighEnergyObsCoreExt.tex‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ \subsection{{\em tracking\_type}}
287287

288288
\subsection{{\em scan\_mode}}
289289

290-
As for the radiotelescope arrays, different modes of observation of the sky are possible for \gls{HEA} instrumemts, leading to different instrument responses and special analysis schemes. The proposal of ObsCore Extension For Radio Data\footnote{The current note can be found \href{https://www.ivoa.net/documents/ObsCoreExtensionForRadioData/20240614/index.html}{here}.} proposes to add the field {\bf scan\_mode} to qualify this observation property. The values are up to the data providers but pre-defined names are proposed: {\em on-source}, {\em on-off}, {\em raster-map} (that is the grid obervation for \glspl{IACT}), {\em on-the-fly-cross-map} or OTF (when telescopes are slewing between two points of the sky), {\em on-the-fly-map} (that is the wobble observation for \glspl{IACT}).
290+
As for the radiotelescope arrays, different modes of observation of the sky are possible for \gls{HEA} instrumemts, leading to different instrument responses and special analysis schemes. The proposal of ObsCore Extension For Radio Data\footnote{The current note can be found \href{https://www.ivoa.net/documents/ObsCoreExtensionForRadioData/20240614/index.html}{here}.} proposes to add the field {\bf scan\_mode} to qualify this observation property. The values are up to the data providers but pre-defined names are proposed: {\em on-source}, {\em on-off}, {\em raster-map} (that is the grid obervation for \glspl{IACT}), {\em on-the-fly-cross-map} or OTF (when telescopes are slewing between two points of the sky), {\em on-the-fly-map} (that is the wobble observation for \glspl{IACT}). We note that permissible {\bf scan\_mode} values are possible beyond the predefined values.
291291

292292

293293
\subsection{{\em pointing\_mode}}
@@ -524,7 +524,6 @@ \subsubsection{Evolution of UCD list}
524524
\label{tab:upgrade_he_ucds}
525525
\end{longtable}
526526

527-
528527
\subsection{MIME-types Enhancements}\label{sec:mimetypes}
529528

530529
Data files used in the \gls{HEA} domain should have appropriate MIME-types, so that they can be shown in ObsCore tables or elsewhere.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DOCNAME = HighEnergyObsCoreExt
88
DOCVERSION = 1.0
99

1010
# Publication date, ISO format; update manually for "releases"
11-
DOCDATE = 2025-06-26
11+
DOCDATE = 2025-10-26
1212

1313
# What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
1414
DOCTYPE = PEN

‎UseCases.tex‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,9 @@ \subsubsection{Use Case --- Search for SWGO event lists and their \glspl{IRF} f
191191
SELECT * FROM ivoa.obscore
192192
NATURAL JOIN ivoa.obscore_hea
193193
WHERE (INTERSECTS(s_region, CIRCLE(312.775, 30.683, 1.5)) = 1)
194-
AND (dataproduct_type = 'event-list' OR dataproduct_type = 'aeff' OR dataproduct_type = 'edisp'
195-
OR dataproduct_type = 'psf' OR dataproduct_type = 'bkgrate')
194+
AND (dataproduct_type = 'event-list' OR dataproduct_type = 'aeff'
195+
OR dataproduct_type = 'edisp' OR dataproduct_type = 'psf' OR
196+
dataproduct_type = 'bkgrate')
196197
AND (obs_collection = 'SWGO-DR1')
197198
AND (event_type = 'very-good')
198199
\end{verbatim}
@@ -251,8 +252,6 @@ \subsubsection{Use Case --- Search for event lists and their \glspl{IRF} of CTAO
251252
EVENT_FILE['OBS_ID'] = GET RAW['accessURL']
252253
\end{verbatim}
253254

254-
\todo[inline]{To Be Checked - Mathieu, Mireille?}
255-
256255

257256
\subsection{Very-High-Level Data Products}
258257

‎ivoatex‎

0 commit comments

Comments
 (0)