diff --git a/HighEnergyObsCoreExt.glg b/HighEnergyObsCoreExt.glg index f4c5f5d..b7605e3 100644 --- a/HighEnergyObsCoreExt.glg +++ b/HighEnergyObsCoreExt.glg @@ -1,7 +1,7 @@ This is makeindex, version 2.15 [TeX Live 2022/dev] (kpathsea + Thai support). Scanning style file ./HighEnergyObsCoreExt.ist.............................done (29 attributes redefined, 0 ignored). -Scanning input file HighEnergyObsCoreExt.glo....done (93 entries accepted, 0 rejected). -Sorting entries....done (660 comparisons). -Generating output file HighEnergyObsCoreExt.gls....done (45 lines written, 0 warnings). +Scanning input file HighEnergyObsCoreExt.glo....done (121 entries accepted, 0 rejected). +Sorting entries....done (925 comparisons). +Generating output file HighEnergyObsCoreExt.gls....done (52 lines written, 0 warnings). Output written in HighEnergyObsCoreExt.gls. Transcript written in HighEnergyObsCoreExt.glg. diff --git a/HighEnergyObsCoreExt.gls b/HighEnergyObsCoreExt.gls index 4169427..f0279d9 100644 --- a/HighEnergyObsCoreExt.gls +++ b/HighEnergyObsCoreExt.gls @@ -4,42 +4,49 @@ \glossentry{GTI}{\glossaryentrynumbers{\relax \setentrycounter[]{page}\glsnumberformat{15}}}\glsgroupskip \glsgroupheading{H}\relax \glsresetentrylist % -\glossentry{HE}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{4\delimN 5}\delimN - \setentrycounter[]{page}\glsnumberformat{19}\delimN - \setentrycounter[]{page}\glsnumberformat{23\delimR 25}\delimN - \setentrycounter[]{page}\glsnumberformat{32}}}% \glossentry{HEA}{\glossaryentrynumbers{\relax \setentrycounter[]{page}\glsnumberformat{1}\delimN - \setentrycounter[]{page}\glsnumberformat{4\delimR 11}\delimN - \setentrycounter[]{page}\glsnumberformat{13\delimR 18}\delimN - \setentrycounter[]{page}\glsnumberformat{22\delimN 23}}}% + \setentrycounter[]{page}\glsnumberformat{5\delimR 11}\delimN + \setentrycounter[]{page}\glsnumberformat{13\delimR 19}\delimN + \setentrycounter[]{page}\glsnumberformat{21}\delimN + \setentrycounter[]{page}\glsnumberformat{23\delimR 25}\delimN + \setentrycounter[]{page}\glsnumberformat{28\delimN 29}\delimN + \setentrycounter[]{page}\glsnumberformat{32}\delimN + \setentrycounter[]{page}\glsnumberformat{41}}}% \glossentry{HEIG}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{4}}}\glsgroupskip + \setentrycounter[]{page}\glsnumberformat{5}\delimN + \setentrycounter[]{page}\glsnumberformat{41}}}\glsgroupskip \glsgroupheading{I}\relax \glsresetentrylist % +\glossentry{IACT}{\glossaryentrynumbers{\relax + \setentrycounter[]{page}\glsnumberformat{17\delimN 18}}}% \glossentry{IRF}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{6}\delimN - \setentrycounter[]{page}\glsnumberformat{8\delimN 9}\delimN + \setentrycounter[]{page}\glsnumberformat{3\delimN 4}\delimN + \setentrycounter[]{page}\glsnumberformat{6\delimR 9}\delimN \setentrycounter[]{page}\glsnumberformat{11}\delimN - \setentrycounter[]{page}\glsnumberformat{17\delimR 19}}}% + \setentrycounter[]{page}\glsnumberformat{18\delimR 20}\delimN + \setentrycounter[]{page}\glsnumberformat{33}\delimN + \setentrycounter[]{page}\glsnumberformat{35\delimR 37}}}% \glossentry{IVOA}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{4}\delimN - \setentrycounter[]{page}\glsnumberformat{6\delimN 7}\delimN - \setentrycounter[]{page}\glsnumberformat{18}\delimN - \setentrycounter[]{page}\glsnumberformat{32}}}\glsgroupskip + \setentrycounter[]{page}\glsnumberformat{5}\delimN + \setentrycounter[]{page}\glsnumberformat{7\delimN 8}\delimN + \setentrycounter[]{page}\glsnumberformat{19}\delimN + \setentrycounter[]{page}\glsnumberformat{41}}}\glsgroupskip \glsgroupheading{M}\relax \glsresetentrylist % \glossentry{MOC}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{15}}}\glsgroupskip + \setentrycounter[]{page}\glsnumberformat{16}}}\glsgroupskip \glsgroupheading{S}\relax \glsresetentrylist % \glossentry{STI}{\glossaryentrynumbers{\relax \setentrycounter[]{page}\glsnumberformat{15}}}\glsgroupskip \glsgroupheading{U}\relax \glsresetentrylist % \glossentry{UHE}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{24}}}\glsgroupskip + \setentrycounter[]{page}\glsnumberformat{25}}}\glsgroupskip \glsgroupheading{V}\relax \glsresetentrylist % \glossentry{VHE}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{24}}}% + \setentrycounter[]{page}\glsnumberformat{25}}}% \glossentry{VO}{\glossaryentrynumbers{\relax - \setentrycounter[]{page}\glsnumberformat{4}\delimN - \setentrycounter[]{page}\glsnumberformat{6}}}% + \setentrycounter[]{page}\glsnumberformat{4\delimN 5}\delimN + \setentrycounter[]{page}\glsnumberformat{7}}}\glsgroupskip +\glsgroupheading{W}\relax \glsresetentrylist % +\glossentry{WCD}{\glossaryentrynumbers{\relax + \setentrycounter[]{page}\glsnumberformat{18}}}% \end{theglossary}\glossarypostamble diff --git a/HighEnergyObsCoreExt.tex b/HighEnergyObsCoreExt.tex index 8c29401..c2a99f3 100644 --- a/HighEnergyObsCoreExt.tex +++ b/HighEnergyObsCoreExt.tex @@ -287,7 +287,7 @@ \subsection{{\em tracking\_type}} \subsection{{\em scan\_mode}} -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}). +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. \subsection{{\em pointing\_mode}} @@ -524,7 +524,6 @@ \subsubsection{Evolution of UCD list} \label{tab:upgrade_he_ucds} \end{longtable} - \subsection{MIME-types Enhancements}\label{sec:mimetypes} Data files used in the \gls{HEA} domain should have appropriate MIME-types, so that they can be shown in ObsCore tables or elsewhere. diff --git a/Makefile b/Makefile index db699f2..c554bca 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ DOCNAME = HighEnergyObsCoreExt DOCVERSION = 1.0 # Publication date, ISO format; update manually for "releases" -DOCDATE = 2025-06-26 +DOCDATE = 2025-10-26 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN DOCTYPE = PEN diff --git a/UseCases.tex b/UseCases.tex index 90abf80..9729e39 100644 --- a/UseCases.tex +++ b/UseCases.tex @@ -191,8 +191,9 @@ \subsubsection{Use Case --- Search for SWGO event lists and their \glspl{IRF} f SELECT * FROM ivoa.obscore NATURAL JOIN ivoa.obscore_hea WHERE (INTERSECTS(s_region, CIRCLE(312.775, 30.683, 1.5)) = 1) -AND (dataproduct_type = 'event-list' OR dataproduct_type = 'aeff' OR dataproduct_type = 'edisp' - OR dataproduct_type = 'psf' OR dataproduct_type = 'bkgrate') +AND (dataproduct_type = 'event-list' OR dataproduct_type = 'aeff' + OR dataproduct_type = 'edisp' OR dataproduct_type = 'psf' OR + dataproduct_type = 'bkgrate') AND (obs_collection = 'SWGO-DR1') AND (event_type = 'very-good') \end{verbatim} @@ -251,8 +252,6 @@ \subsubsection{Use Case --- Search for event lists and their \glspl{IRF} of CTAO EVENT_FILE['OBS_ID'] = GET RAW['accessURL'] \end{verbatim} -\todo[inline]{To Be Checked - Mathieu, Mireille?} - \subsection{Very-High-Level Data Products} diff --git a/ivoatex b/ivoatex index e18ad7f..f892b61 160000 --- a/ivoatex +++ b/ivoatex @@ -1 +1 @@ -Subproject commit e18ad7ffb2a4aae8a182639d6667608b1c231b20 +Subproject commit f892b61d2f71eacaed286efde84e586619b3e0b1