diff --git a/doc/Makefile b/doc/Makefile index bb3fc57..50950b3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -7,7 +7,7 @@ DOCNAME = MANGO DOCVERSION = 1.0 # Publication date, ISO format; update manually for "releases" -DOCDATE = 2026-01-29 +DOCDATE = 2026-02-26 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN DOCTYPE = PR diff --git a/doc/ivoatexmeta.tex b/doc/ivoatexmeta.tex index 9bd4469..43f3ece 100644 --- a/doc/ivoatexmeta.tex +++ b/doc/ivoatexmeta.tex @@ -1,7 +1,7 @@ % GENERATED FILE -- edit this in the Makefile \newcommand{\ivoaDocversion}{1.0} -\newcommand{\ivoaDocdate}{2026-01-29} -\newcommand{\ivoaDocdatecode}{20260129} +\newcommand{\ivoaDocdate}{2026-02-26} +\newcommand{\ivoaDocdatecode}{20260226} \newcommand{\ivoaDoctype}{PR} \newcommand{\ivoaDocname}{MANGO} \renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO} diff --git a/doc/model.tex b/doc/model.tex index 50e25f2..a18df33 100644 --- a/doc/model.tex +++ b/doc/model.tex @@ -60,7 +60,7 @@ \section{Model: mango } \subsection{Brightness} \label{sect:Brightness} - Observed brightness of the \texttt{MangoObject}. The purpose of this property is to gather a brightness value with its error and the its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1). + Observed brightness of the \texttt{MangoObject}. The purpose of this property is to gather a brightness value with its error and its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1). \subsubsection{Brightness.value} \textbf{vodml-id: Brightness.value} \newline @@ -82,7 +82,7 @@ \section{Model: mango } \subsection{Color} \label{sect:Color} - Property that describes a color of the \texttt{MangoObject}. The purpose of this property is to gather a color value with its error and the 2 related filters (high and low) The color can be given as a magnitude difference or an hardness ratio. + Property that describes a color of the \texttt{MangoObject}. The purpose of this property is to gather a color value with its error and the 2 related filters (high and low) The color can be given as a magnitude difference or a hardness ratio. \subsubsection{Color.value} \textbf{vodml-id: Color.value} \newline @@ -104,7 +104,7 @@ \section{Model: mango } \subsection{ColorDef} \label{sect:ColorDef} - Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio) and the filters on which the color is based. In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} with a square transfert function. + Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio) and the filters on which the color is based. In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} with a square transfer function. \subsubsection{ColorDef.definition} \textbf{vodml-id: ColorDef.definition} \newline @@ -116,13 +116,13 @@ \section{Model: mango } \textbf{vodml-id: ColorDef.high} \newline \textbf{type: Phot:PhotometryFilter} \newline \textbf{multiplicity: 1} \newline - Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding the higher band of the color. + Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding to the higher band of the color. \subsubsection{ColorDef.low} \textbf{vodml-id: ColorDef.low} \newline \textbf{type: Phot:PhotometryFilter} \newline \textbf{multiplicity: 1} \newline - Reference to the \texttt{Phot:PhotometryFilter} corresponding the lower band for that color. + Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color. \subsection{DataLink} \label{sect:DataLink} @@ -178,7 +178,7 @@ \section{Model: mango } \label{sect:EpochPosition} - This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the Astronomical Measurements Model \citep{2022ivoa.specQ1004R} that have been put together to form a consistent description of the position of an object moving over time. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems model \citep{2022ivoa.spec.1004R} At a high level the properties map as follows: \begin{itemize} \item celestial position -> \texttt{meas:Position} \item proper motion -> \texttt{meas:ProperMotion} \item radial velocity -> \texttt{meas.Velocity} \item parallax -> no suitable counterpart at this time \end{itemize} All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:SpaceSys}. \item The time coordinate system is imported from \texttt{coords:TimeSys}. \end{itemize} It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead of the \texttt{epoch} field of \texttt{coords:SpaceSys}. There are 2 reasons for this: \begin{itemize} \item Using the epoch of \texttt{coords:SpaceSys} requires to work with the \texttt{coords:CustomRefLocation} class to carry the reference location. This class does not support the standard reference locations such as e.g. BARYCENTER. \item The observation date can be read in a column and therefore change with each data row. In this case, it cannot be stored as an element of the space coordinate system but as an \texttt{EpochPosition} attribute. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize} + This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the Astronomical Measurements Model \citep{2022ivoa.specQ1004R} that have been put together to form a consistent description of the position of an object moving over time. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems model \citep{2022ivoa.spec.1004R}. At a high level the properties map as follows: \begin{itemize} \item celestial position -> \texttt{meas:Position} \item proper motion -> \texttt{meas:ProperMotion} \item radial velocity -> \texttt{meas.Velocity} \item parallax -> no suitable counterpart at this time \end{itemize} All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:SpaceSys}. \item The time coordinate system is imported from \texttt{coords:TimeSys}. \end{itemize} It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead of the \texttt{epoch} field of \texttt{coords:SpaceSys}. There are 2 reasons for this: \begin{itemize} \item Using the epoch of \texttt{coords:SpaceSys} requires to work with the \texttt{coords:CustomRefLocation} class to carry the reference location. This class does not support the standard reference locations such as e.g. BARYCENTER. \item The observation date can be read in a column and therefore change with each data row. In this case, it cannot be stored as an element of the space coordinate system but as an \texttt{EpochPosition} attribute. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize} \subsubsection{EpochPosition.longitude} \textbf{vodml-id: EpochPosition.longitude} \newline @@ -244,13 +244,13 @@ \section{Model: mango } \textbf{vodml-id: EpochPosition.spaceSys} \newline \textbf{type: coords:SpaceSys} \newline \textbf{multiplicity: 1} \newline - System that applies the space coordinates. + System that applies to the space coordinates. \subsubsection{EpochPosition.timeSys} \textbf{vodml-id: EpochPosition.timeSys} \newline \textbf{type: coords:TimeSys} \newline \textbf{multiplicity: 1} \newline - System that applies the time coordinates (the epoch). + System that applies to the time coordinates (the epoch). \subsection{EpochPositionCorrelations} \label{sect:EpochPositionCorrelations} @@ -466,7 +466,7 @@ \section{Model: mango } \subsection{StatusValue} \label{sect:StatusValue} - Value allowed for a status; contain the value with a free text description. + Value allowed for a status; contains the value with a free text description. \subsubsection{StatusValue.value} \textbf{vodml-id: StatusValue.value} \newline @@ -498,13 +498,13 @@ \section{Model: mango } \textbf{vodml-id: VocabularyTerm.uri} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - URI the vocabulary term + URI of the vocabulary term \subsubsection{VocabularyTerm.label} \textbf{vodml-id: VocabularyTerm.label} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 0..1} \newline - Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. This was the case for the IUA vocabulary until the Registry WG introduced rewriting rules that fix the issue. + Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. This was the case for the UAT vocabulary until the Registry WG introduced rewriting rules that fix the issue. \subsection{year} \label{sect:year} @@ -564,7 +564,7 @@ \section{Model: mango } \section{Package: error } \begin{figure}[h] \includegraphics[width=1.0\textwidth]{../model/error.png} - \caption{package error} + \caption{error package} \label{fig:error} \end{figure} @@ -578,7 +578,7 @@ \section{Package: error } %\end{center} %\end{figure} - The \texttt{error} package (fig \ref{fig:error}) groups the MANGO built-in error classes. All these classes are derived from \texttt{meas:Uncertainty} to make them reusable by \texttt{meas:Measure} instances. Mango errors all have an attribute that specifies the confidence level + The \texttt{error} package (fig \ref{fig:error}) groups the MANGO built-in error classes. All these classes are derived from \texttt{meas:Uncertainty} to make them reusable by \texttt{meas:Measure} instances. Mango errors all have an attribute that specifies the confidence level. \subsection{PErrorAsym1D} \label{sect:error.PErrorAsym1D} @@ -616,7 +616,7 @@ \section{Package: error } \textbf{vodml-id: error.PErrorEllipse.angle} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:RealQuantity}} \newline \textbf{multiplicity: 1} \newline - In theory, this is the angle between the North Polar Cape (NPC) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit. In practice, the angle definition is this used by the mapped data set. It is usually the angle between the major axis and the north axis (negative along of the clockwise direction). + In theory, this is the angle between the North Celestial Pole (NCP) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit. In practice, the angle definition is this used by the mapped data set. It is usually the angle between the major axis and the north axis (negative along of the clockwise direction). \subsection{PErrorSym1D} \label{sect:error.PErrorSym1D} @@ -658,13 +658,13 @@ \section{Package: error } \textbf{vodml-id: error.PropertyError.distribution} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - Statistical distribution of the error. The Value can a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). + Statistical distribution of the error. The Value can be a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). \pagebreak \section{Package: origin } \begin{figure}[h] \includegraphics[width=1.0\textwidth]{../model/origin.png} - \caption{package origin} + \caption{origin package} \label{fig:origin} \end{figure} @@ -678,7 +678,7 @@ \section{Package: origin } %\end{center} %\end{figure} - Package grouping together all the components needed to model the origin of the \texttt{MangoObject} (fig \ref{fig:origin}). The design of the package complies with the work of the DCP interest group (see \url{https://ivoa.net/documents/DataOrigin/index.html}) + Package grouping together all the components needed to model the origin of the \texttt{MangoObject} (fig \ref{fig:origin}). The design of the package complies with the work of the DCP interest group (see \url{https://ivoa.net/documents/DataOrigin/index.html}). \subsection{Article} \label{sect:origin.Article} @@ -722,7 +722,7 @@ \section{Package: origin } \textbf{vodml-id: origin.DataOrigin.creators} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 0..*} \newline - Person(s) mainly involved in the creation of the resource, generally the author + Person(s) mainly involved in the creation of the resource, generally the author(s). \subsubsection{DataOrigin.cites} \textbf{vodml-id: origin.DataOrigin.cites} \newline @@ -752,7 +752,7 @@ \section{Package: origin } \textbf{vodml-id: origin.DataOrigin.rights\_uri} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - Licence URI. Following Registry practice, this should come from SPDX (\url{https://spdx.org/licenses}), though Creative Commons URLs (\url{https://creativecommons.org are also admitted}). + Licence URI. Following Registry practice, this should come from SPDX (\url{https://spdx.org/licenses}), though Creative Commons URLs (\url{https://creativecommons.org}) are also admitted. \subsubsection{DataOrigin.articles} \textbf{vodml-id: origin.DataOrigin.articles} \newline @@ -786,7 +786,7 @@ \section{Package: origin } \textbf{vodml-id: origin.QueryOrigin.request} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. The format is free for others request types. + Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. The format is free for other request types. \subsubsection{QueryOrigin.request\_date} \textbf{vodml-id: origin.QueryOrigin.request\_date} \newline diff --git a/doc/model_toc.tex b/doc/model_toc.tex index 9dfc3db..c31bea6 100644 --- a/doc/model_toc.tex +++ b/doc/model_toc.tex @@ -83,13 +83,13 @@ \section{Model: mango} \textbf{vodml-id: VocabularyTerm.uri} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - URI the vocabulary term + URI of the vocabulary term \subsubsection{VocabularyTerm.label} \textbf{vodml-id: VocabularyTerm.label} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 0..1} \newline - Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. This was the case for the IUA vocabulary until the Registry WG introduced rewriting rules that fix the issue. + Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. This was the case for the UAT vocabulary until the Registry WG introduced rewriting rules that fix the issue. \section{Date Time Types} The abstract primitive type \texttt{ivoa:datetime} has been extended to include: @@ -125,7 +125,7 @@ \section{Epoch Position Properties} \label{fig:EpochPosition} \end{figure} \label{sect:EpochPosition} - This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the Astronomical Measurements Model \citep{2022ivoa.specQ1004R} that have been put together to form a consistent description of the position of an object moving over time. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems model \citep{2022ivoa.spec.1004R} At a high level the properties map as follows: \begin{itemize} \item celestial position -> \texttt{meas:Position} \item proper motion -> \texttt{meas:ProperMotion} \item radial velocity -> \texttt{meas.Velocity} \item parallax -> no suitable counterpart at this time \end{itemize} All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:SpaceSys}. \item The time coordinate system is imported from \texttt{coords:TimeSys}. \end{itemize} It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead of the \texttt{epoch} field of \texttt{coords:SpaceSys}. There are 2 reasons for this: \begin{itemize} \item Using the epoch of \texttt{coords:SpaceSys} requires to work with the \texttt{coords:CustomRefLocation} class to carry the reference location. This class does not support the standard reference locations such as e.g. BARYCENTER. \item The observation date can be read in a column and therefore change with each data row. In this case, it cannot be stored as an element of the space coordinate system but as an \texttt{EpochPosition} attribute. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize} + This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the Astronomical Measurements Model \citep{2022ivoa.specQ1004R} that have been put together to form a consistent description of the position of an object moving over time. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems model \citep{2022ivoa.spec.1004R}. At a high level the properties map as follows: \begin{itemize} \item celestial position -> \texttt{meas:Position} \item proper motion -> \texttt{meas:ProperMotion} \item radial velocity -> \texttt{meas.Velocity} \item parallax -> no suitable counterpart at this time \end{itemize} All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:SpaceSys}. \item The time coordinate system is imported from \texttt{coords:TimeSys}. \end{itemize} It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead of the \texttt{epoch} field of \texttt{coords:SpaceSys}. There are 2 reasons for this: \begin{itemize} \item Using the epoch of \texttt{coords:SpaceSys} requires to work with the \texttt{coords:CustomRefLocation} class to carry the reference location. This class does not support the standard reference locations such as e.g. BARYCENTER. \item The observation date can be read in a column and therefore change with each data row. In this case, it cannot be stored as an element of the space coordinate system but as an \texttt{EpochPosition} attribute. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize} \subsubsection{EpochPosition.longitude} \textbf{vodml-id: EpochPosition.longitude} \newline @@ -191,13 +191,13 @@ \section{Epoch Position Properties} \textbf{vodml-id: EpochPosition.spaceSys} \newline \textbf{type: coords:SpaceSys} \newline \textbf{multiplicity: 1} \newline - System that applies the space coordinates. + System that applies to the space coordinates. \subsubsection{EpochPosition.timeSys} \textbf{vodml-id: EpochPosition.timeSys} \newline \textbf{type: coords:TimeSys} \newline \textbf{multiplicity: 1} \newline - System that applies the time coordinates (the epoch). + System that applies to the time coordinates (the epoch). \subsection{EpochPositionCorrelations} \label{sect:EpochPositionCorrelations} @@ -304,7 +304,7 @@ \section{Photometric and Spectroscopic Properties} photometric filters are imported from \texttt{PhotDM}. \subsection{Brightness} \label{sect:Brightness} - Observed brightness of the \texttt{MangoObject}. The purpose of this property is to gather a brightness value with its error and the its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1). + Observed brightness of the \texttt{MangoObject}. The purpose of this property is to gather a brightness value with its error and its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1). \subsubsection{Brightness.value} \textbf{vodml-id: Brightness.value} \newline @@ -326,7 +326,7 @@ \section{Photometric and Spectroscopic Properties} \subsection{Color} \label{sect:Color} - Property that describes a color of the \texttt{MangoObject}. The purpose of this property is to gather a color value with its error and the 2 related filters (high and low) The color can be given as a magnitude difference or an hardness ratio. + Property that describes a color of the \texttt{MangoObject}. The purpose of this property is to gather a color value with its error and the 2 related filters (high and low) The color can be given as a magnitude difference or a hardness ratio. \subsubsection{Color.value} \textbf{vodml-id: Color.value} \newline @@ -348,7 +348,7 @@ \section{Photometric and Spectroscopic Properties} \subsection{ColorDef} \label{sect:ColorDef} - Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio) and the filters on which the color is based. In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} with a square transfert function. + Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio) and the filters on which the color is based. In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} with a square transfer function. \subsubsection{ColorDef.definition} \textbf{vodml-id: ColorDef.definition} \newline @@ -360,13 +360,13 @@ \section{Photometric and Spectroscopic Properties} \textbf{vodml-id: ColorDef.high} \newline \textbf{type: Phot:PhotometryFilter} \newline \textbf{multiplicity: 1} \newline - Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding the higher band of the color. + Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding to the higher band of the color. \subsubsection{ColorDef.low} \textbf{vodml-id: ColorDef.low} \newline \textbf{type: Phot:PhotometryFilter} \newline \textbf{multiplicity: 1} \newline - Reference to the \texttt{Phot:PhotometryFilter} corresponding the lower band for that color. + Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color. \subsection{ColorDefinition} \label{sect:ColorDefinition} @@ -448,7 +448,7 @@ \section{Other Properties} \subsection{StatusValue} \label{sect:StatusValue} - Value allowed for a status; contain the value with a free text description. + Value allowed for a status; contains the value with a free text description. \subsubsection{StatusValue.value} \textbf{vodml-id: StatusValue.value} \newline @@ -503,10 +503,10 @@ \section{Other Properties} \section{Package: error} \begin{figure}[h] \includegraphics[width=1.0\textwidth]{../model/error.png} - \caption{package error} + \caption{error package} \label{fig:error} \end{figure} - The \texttt{error} package (fig \ref{fig:error}) groups the MANGO built-in error classes. All these classes are derived from \texttt{meas:Uncertainty} to make them reusable by \texttt{meas:Measure} instances. Mango errors all have an attribute that specifies the confidence level + The \texttt{error} package (fig \ref{fig:error}) groups the MANGO built-in error classes. All these classes are derived from \texttt{meas:Uncertainty} to make them reusable by \texttt{meas:Measure} instances. Mango errors all have an attribute that specifies the confidence level. \subsection{PropertyError (Abstract)} \label{sect:error.PropertyError} @@ -522,7 +522,7 @@ \section{Package: error} \textbf{vodml-id: error.PropertyError.distribution} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - Statistical distribution of the error. The Value can a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). + Statistical distribution of the error. The Value can be a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). \subsection{PErrorSym1D} \label{sect:error.PErrorSym1D} @@ -570,7 +570,7 @@ \section{Package: error} \textbf{vodml-id: error.PErrorEllipse.angle} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:RealQuantity}} \newline \textbf{multiplicity: 1} \newline - In theory, this is the angle between the North Polar Cape (NPC) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit. In practice, the angle definition is this used by the mapped data set. It is usually the angle between the major axis and the north axis (negative along of the clockwise direction). + In theory, this is the angle between the North Celestial Pole (NCP) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit. In practice, the angle definition is this used by the mapped data set. It is usually the angle between the major axis and the north axis (negative along of the clockwise direction). \subsection{PErrorSym2D} \label{sect:error.PErrorSym2D} @@ -591,10 +591,10 @@ \section{Package: error} \section{Package: origin} \begin{figure}[h] \includegraphics[width=1.0\textwidth]{../model/origin.png} - \caption{package origin} + \caption{origin package} \label{fig:origin} \end{figure} - Package grouping together all the components needed to model the origin of the \texttt{MangoObject} (fig \ref{fig:origin}). The design of the package complies with the work of the DCP interest group (see \url{https://ivoa.net/documents/DataOrigin/index.html}) + Package grouping together all the components needed to model the origin of the \texttt{MangoObject} (fig \ref{fig:origin}). The design of the package complies with the work of the DCP interest group (see \url{https://ivoa.net/documents/DataOrigin/index.html}). \subsection{QueryOrigin} \label{sect:origin.QueryOrigin} @@ -622,7 +622,7 @@ \section{Package: origin} \textbf{vodml-id: origin.QueryOrigin.request} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. The format is free for others request types. + Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. The format is free for other request types. \subsubsection{QueryOrigin.request\_date} \textbf{vodml-id: origin.QueryOrigin.request\_date} \newline @@ -680,7 +680,7 @@ \section{Package: origin} \textbf{vodml-id: origin.DataOrigin.creators} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 0..*} \newline - Person(s) mainly involved in the creation of the resource, generally the author + Person(s) mainly involved in the creation of the resource, generally the author(s). \subsubsection{DataOrigin.cites} \textbf{vodml-id: origin.DataOrigin.cites} \newline @@ -710,7 +710,7 @@ \section{Package: origin} \textbf{vodml-id: origin.DataOrigin.rights\_uri} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline - Licence URI. Following Registry practice, this should come from SPDX (\url{https://spdx.org/licenses}), though Creative Commons URLs (\url{https://creativecommons.org are also admitted}). + Licence URI. Following Registry practice, this should come from SPDX (\url{https://spdx.org/licenses}), though Creative Commons URLs (\url{https://creativecommons.org}) are also admitted. \subsubsection{DataOrigin.articles} \textbf{vodml-id: origin.DataOrigin.articles} \newline diff --git a/mivot/mango/mango.Brightness.xml b/mivot/mango/mango.Brightness.xml index 04fd6b6..e2f30cd 100644 --- a/mivot/mango/mango.Brightness.xml +++ b/mivot/mango/mango.Brightness.xml @@ -1,6 +1,6 @@ diff --git a/mivot/mango/mango.Color.xml b/mivot/mango/mango.Color.xml index ca78d8a..2be20e0 100644 --- a/mivot/mango/mango.Color.xml +++ b/mivot/mango/mango.Color.xml @@ -1,7 +1,7 @@ @@ -19,7 +19,7 @@ The color can be given as a magnitude difference or an hardness ratio. +with a square transfer function." --> diff --git a/mivot/mango/mango.ColorDef.xml b/mivot/mango/mango.ColorDef.xml index 4377643..843bac8 100644 --- a/mivot/mango/mango.ColorDef.xml +++ b/mivot/mango/mango.ColorDef.xml @@ -2,7 +2,7 @@ +with a square transfer function." --> diff --git a/mivot/mango/mango.EpochPosition.xml b/mivot/mango/mango.EpochPosition.xml index 1aa5177..13751f5 100644 --- a/mivot/mango/mango.EpochPosition.xml +++ b/mivot/mango/mango.EpochPosition.xml @@ -5,7 +5,7 @@ It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems - model \citep{2022ivoa.spec.1004R} + model \citep{2022ivoa.spec.1004R}. At a high level the properties map as follows: \begin{itemize} @@ -20,7 +20,7 @@ All components use the same coordinate systems for both time and space coordinat \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. - \item The space coordinate system is imported from \texttt{coordsSpaceSys}. + \item The space coordinate system is imported from \texttt{coords:SpaceSys}. \item The time coordinate system is imported from \texttt{coords:TimeSys}. \end{itemize} diff --git a/mivot/mango/mango.Status.xml b/mivot/mango/mango.Status.xml index d8d6db7..55fa1a0 100644 --- a/mivot/mango/mango.Status.xml +++ b/mivot/mango/mango.Status.xml @@ -17,7 +17,7 @@ that can only take on a defined number of values, each with its own description. " --> - + diff --git a/mivot/mango/mango.StatusValue.xml b/mivot/mango/mango.StatusValue.xml index a003135..61bee45 100644 --- a/mivot/mango/mango.StatusValue.xml +++ b/mivot/mango/mango.StatusValue.xml @@ -1,5 +1,5 @@ - + diff --git a/mivot/mango/mango.StatusValues.xml b/mivot/mango/mango.StatusValues.xml index 856d071..0458822 100644 --- a/mivot/mango/mango.StatusValues.xml +++ b/mivot/mango/mango.StatusValues.xml @@ -3,7 +3,7 @@ " --> - + diff --git a/utils/processVodml.py b/utils/processVodml.py index d2dcb69..6a75844 100644 --- a/utils/processVodml.py +++ b/utils/processVodml.py @@ -21,7 +21,7 @@ image = r"""\1 \2 } \\begin{figure}[h] \\includegraphics[width=1.0\\textwidth]{../model/\2.png} - \\caption{package \2} + \\caption{\2 package} \\label{fig:\2} \\end{figure}\n """ diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml index c3981d8..ff7e4ee 100644 --- a/vo-dml/desc.mango.vo-dml.xml +++ b/vo-dml/desc.mango.vo-dml.xml @@ -123,7 +123,7 @@ Using the polygon serialization requires the space coordinate system to be defin VocabularyTerm.uri uri - URI the vocabulary term + URI of the vocabulary term ivoa:string @@ -137,7 +137,7 @@ Using the polygon serialization requires the space coordinate system to be defin label Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. -This was the case for the IUA vocabulary until the Registry WG introduced +This was the case for the UAT vocabulary until the Registry WG introduced rewriting rules that fix the issue. ivoa:string @@ -579,7 +579,7 @@ in \url{http://www.ivoa.net/rdf/processing-level} Color Property that describes a color of the \texttt{MangoObject}. The purpose of this property is to gather a color value with its error and the 2 related filters (high and low) -The color can be given as a magnitude difference or an hardness ratio. +The color can be given as a magnitude difference or a hardness ratio. mango:Property @@ -630,7 +630,7 @@ The color can be given as a magnitude difference or an hardness ratio. Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio) and the filters on which the color is based. In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} -with a square transfert function. +with a square transfer function. ColorDef.definition definition @@ -646,7 +646,8 @@ with a square transfert function. ColorDef.high high - Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding the higher band of the color. + Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding +to the higher band of the color. Phot:PhotometryFilter @@ -659,7 +660,7 @@ with a square transfert function. ColorDef.low low - Reference to the \texttt{Phot:PhotometryFilter} corresponding the lower band for that color. + Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color. Phot:PhotometryFilter @@ -693,7 +694,7 @@ with a square transfert function. StatusValue StatusValue - Value allowed for a status; contain the value with a free text description. + Value allowed for a status; contains the value with a free text description. StatusValue.value value @@ -729,7 +730,7 @@ with a square transfert function. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems - model \citep{2022ivoa.spec.1004R} + model \citep{2022ivoa.spec.1004R}. At a high level the properties map as follows: \begin{itemize} @@ -931,7 +932,7 @@ providers to convey whether or not the factor has been applied (see \texttt{meas EpochPosition.spaceSys spaceSys - System that applies the space coordinates. + System that applies to the space coordinates. coords:SpaceSys @@ -943,7 +944,7 @@ providers to convey whether or not the factor has been applied (see \texttt{meas EpochPosition.timeSys timeSys - System that applies the time coordinates (the epoch). + System that applies to the time coordinates (the epoch). coords:TimeSys @@ -1150,7 +1151,7 @@ providers to convey whether or not the factor has been applied (see \texttt{meas Brightness Brightness Observed brightness of the \texttt{MangoObject}. -The purpose of this property is to gather a brightness value with its error and the its photometric calibration +The purpose of this property is to gather a brightness value with its error and its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1). @@ -1203,7 +1204,7 @@ It must be an instance of \texttt{photdm:PhotCal}. The \texttt{error} package (fig \ref{fig:error}) groups the MANGO built-in error classes. All these classes are derived from \texttt{meas:Uncertainty} to make them reusable by \texttt{meas:Measure} instances. Mango errors all -have an attribute that specifies the confidence level +have an attribute that specifies the confidence level. error.PropertyError PropertyError @@ -1227,7 +1228,7 @@ The confidence level must be in $[0, 1]$ (not enforced by the VO-DML schema).error.PropertyError.distribution distribution Statistical distribution of the error. -The Value can a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). +The Value can be a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). ivoa:string @@ -1295,7 +1296,7 @@ This is not enforced by the model. The definition of the ellipse attribute is im error.PErrorEllipse.angle angle - In theory, this is the angle between the North Polar Cape (NPC) and the major axis. + In theory, this is the angle between the North Celestial Pole (NCP) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit. In practice, the angle definition is this used by the mapped data set. @@ -1386,7 +1387,7 @@ It is usually the angle between the major axis and the north axis (negative alon origin Package grouping together all the components needed to model the origin of the \texttt{MangoObject} (fig \ref{fig:origin}). The design of the package complies with the work of the DCP interest -group (see \url{https://ivoa.net/documents/DataOrigin/index.html}) +group (see \url{https://ivoa.net/documents/DataOrigin/index.html}). origin.Article Article @@ -1461,7 +1462,7 @@ group (see \url{https://ivoa.net/documents/DataOrigin/index.html}) origin.DataOrigin.creators creators - Person(s) mainly involved in the creation of the resource, generally the author + Person(s) mainly involved in the creation of the resource, generally the author(s). ivoa:string @@ -1523,7 +1524,7 @@ group (see \url{https://ivoa.net/documents/DataOrigin/index.html}) origin.DataOrigin.rights_uri rights_uri Licence URI. Following Registry practice, this should come from SPDX (\url{https://spdx.org/licenses}), -though Creative Commons URLs (\url{https://creativecommons.org are also admitted}). +though Creative Commons URLs (\url{https://creativecommons.org}) are also admitted. ivoa:string @@ -1592,7 +1593,8 @@ though Creative Commons URLs (\url{https://creativecommons.org are also admitted request Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. -For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. The format is free for others request types. +For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. +The format is free for other request types. ivoa:string diff --git a/vo-dml/desc/desc.Brightness.txt b/vo-dml/desc/desc.Brightness.txt index 692bf09..d18fe90 100644 --- a/vo-dml/desc/desc.Brightness.txt +++ b/vo-dml/desc/desc.Brightness.txt @@ -1,4 +1,4 @@ Observed brightness of the \texttt{MangoObject}. -The purpose of this property is to gather a brightness value with its error and the its photometric calibration +The purpose of this property is to gather a brightness value with its error and its photometric calibration The distinction between fluxes and magnitudes is made by the unit. The photometric calibration is modeled by the \texttt{Phot} data model (1.1). \ No newline at end of file diff --git a/vo-dml/desc/desc.Color.txt b/vo-dml/desc/desc.Color.txt index e21fd66..c7948dd 100644 --- a/vo-dml/desc/desc.Color.txt +++ b/vo-dml/desc/desc.Color.txt @@ -1,3 +1,3 @@ Property that describes a color of the \texttt{MangoObject}. The purpose of this property is to gather a color value with its error and the 2 related filters (high and low) -The color can be given as a magnitude difference or an hardness ratio. +The color can be given as a magnitude difference or a hardness ratio. diff --git a/vo-dml/desc/desc.ColorDef.high.txt b/vo-dml/desc/desc.ColorDef.high.txt index 76cd2ef..ee61b39 100644 --- a/vo-dml/desc/desc.ColorDef.high.txt +++ b/vo-dml/desc/desc.ColorDef.high.txt @@ -1 +1,2 @@ -Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding the higher band of the color. +Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding +to the higher band of the color. diff --git a/vo-dml/desc/desc.ColorDef.low.txt b/vo-dml/desc/desc.ColorDef.low.txt index e2f15aa..8dcad6b 100644 --- a/vo-dml/desc/desc.ColorDef.low.txt +++ b/vo-dml/desc/desc.ColorDef.low.txt @@ -1 +1 @@ -Reference to the \texttt{Phot:PhotometryFilter} corresponding the lower band for that color. +Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color. diff --git a/vo-dml/desc/desc.ColorDef.txt b/vo-dml/desc/desc.ColorDef.txt index ba69dcd..347eb7e 100644 --- a/vo-dml/desc/desc.ColorDef.txt +++ b/vo-dml/desc/desc.ColorDef.txt @@ -1,4 +1,4 @@ Physical color definition giving the way a color is calculated (magnitude difference or hardness ratio) and the filters on which the color is based. In case of hardness ratio, the energy bands might be modeled as instances of \texttt{Phot:PhotometryFilter} -with a square transfert function. \ No newline at end of file +with a square transfer function. \ No newline at end of file diff --git a/vo-dml/desc/desc.EpochPosition.spaceSys.txt b/vo-dml/desc/desc.EpochPosition.spaceSys.txt index 1d9f0a9..76b8f00 100644 --- a/vo-dml/desc/desc.EpochPosition.spaceSys.txt +++ b/vo-dml/desc/desc.EpochPosition.spaceSys.txt @@ -1 +1 @@ -System that applies the space coordinates. \ No newline at end of file +System that applies to the space coordinates. \ No newline at end of file diff --git a/vo-dml/desc/desc.EpochPosition.timeSys.txt b/vo-dml/desc/desc.EpochPosition.timeSys.txt index 8403588..54f4b7e 100644 --- a/vo-dml/desc/desc.EpochPosition.timeSys.txt +++ b/vo-dml/desc/desc.EpochPosition.timeSys.txt @@ -1 +1 @@ -System that applies the time coordinates (the epoch). \ No newline at end of file +System that applies to the time coordinates (the epoch). \ No newline at end of file diff --git a/vo-dml/desc/desc.EpochPosition.txt b/vo-dml/desc/desc.EpochPosition.txt index 4ba6f9c..2089b47 100644 --- a/vo-dml/desc/desc.EpochPosition.txt +++ b/vo-dml/desc/desc.EpochPosition.txt @@ -4,7 +4,7 @@ It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems - model \citep{2022ivoa.spec.1004R} + model \citep{2022ivoa.spec.1004R}. At a high level the properties map as follows: \begin{itemize} diff --git a/vo-dml/desc/desc.StatusValue.txt b/vo-dml/desc/desc.StatusValue.txt index 2a6116d..6d9b425 100644 --- a/vo-dml/desc/desc.StatusValue.txt +++ b/vo-dml/desc/desc.StatusValue.txt @@ -1 +1 @@ -Value allowed for a status; contain the value with a free text description. \ No newline at end of file +Value allowed for a status; contains the value with a free text description. \ No newline at end of file diff --git a/vo-dml/desc/desc.VocabularyTerm.label.txt b/vo-dml/desc/desc.VocabularyTerm.label.txt index 6824e43..0daee9a 100644 --- a/vo-dml/desc/desc.VocabularyTerm.label.txt +++ b/vo-dml/desc/desc.VocabularyTerm.label.txt @@ -1,4 +1,4 @@ Label attached to the vocabulary term. This is necessary because the URI may not contain any explicit label. -This was the case for the IUA vocabulary until the Registry WG introduced +This was the case for the UAT vocabulary until the Registry WG introduced rewriting rules that fix the issue. \ No newline at end of file diff --git a/vo-dml/desc/desc.VocabularyTerm.uri.txt b/vo-dml/desc/desc.VocabularyTerm.uri.txt index 82ba32d..13b1693 100644 --- a/vo-dml/desc/desc.VocabularyTerm.uri.txt +++ b/vo-dml/desc/desc.VocabularyTerm.uri.txt @@ -1 +1 @@ -URI the vocabulary term \ No newline at end of file +URI of the vocabulary term \ No newline at end of file diff --git a/vo-dml/desc/desc.error.PErrorEllipse.angle.txt b/vo-dml/desc/desc.error.PErrorEllipse.angle.txt index 1e97eed..5c9a7eb 100644 --- a/vo-dml/desc/desc.error.PErrorEllipse.angle.txt +++ b/vo-dml/desc/desc.error.PErrorEllipse.angle.txt @@ -1,4 +1,4 @@ -In theory, this is the angle between the North Polar Cape (NPC) and the major axis. +In theory, this is the angle between the North Celestial Pole (NCP) and the major axis. This angle must be positive taking into account that angles are positive from North to the East. The angle has its own unit. In practice, the angle definition is this used by the mapped data set. diff --git a/vo-dml/desc/desc.error.PropertyError.distribution.txt b/vo-dml/desc/desc.error.PropertyError.distribution.txt index bcb04a8..d119e9a 100644 --- a/vo-dml/desc/desc.error.PropertyError.distribution.txt +++ b/vo-dml/desc/desc.error.PropertyError.distribution.txt @@ -1,2 +1,2 @@ Statistical distribution of the error. -The Value can a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). \ No newline at end of file +The Value can be a vocabulary URI (e.g. \url{https://www.ivoa.net/rdf/uat/2024-06-25/uat.html#poisson-distribution}). \ No newline at end of file diff --git a/vo-dml/desc/desc.error.txt b/vo-dml/desc/desc.error.txt index fe21755..ae21978 100644 --- a/vo-dml/desc/desc.error.txt +++ b/vo-dml/desc/desc.error.txt @@ -1,4 +1,4 @@ The \texttt{error} package (fig \ref{fig:error}) groups the MANGO built-in error classes. All these classes are derived from \texttt{meas:Uncertainty} to make them reusable by \texttt{meas:Measure} instances. Mango errors all -have an attribute that specifies the confidence level \ No newline at end of file +have an attribute that specifies the confidence level. \ No newline at end of file diff --git a/vo-dml/desc/desc.origin.DataOrigin.creators.txt b/vo-dml/desc/desc.origin.DataOrigin.creators.txt index 00dfabc..ef3df1e 100644 --- a/vo-dml/desc/desc.origin.DataOrigin.creators.txt +++ b/vo-dml/desc/desc.origin.DataOrigin.creators.txt @@ -1 +1 @@ -Person(s) mainly involved in the creation of the resource, generally the author \ No newline at end of file +Person(s) mainly involved in the creation of the resource, generally the author(s). \ No newline at end of file diff --git a/vo-dml/desc/desc.origin.DataOrigin.rights_uri.txt b/vo-dml/desc/desc.origin.DataOrigin.rights_uri.txt index bc21170..f565973 100644 --- a/vo-dml/desc/desc.origin.DataOrigin.rights_uri.txt +++ b/vo-dml/desc/desc.origin.DataOrigin.rights_uri.txt @@ -1,2 +1,2 @@ Licence URI. Following Registry practice, this should come from SPDX (\url{https://spdx.org/licenses}), -though Creative Commons URLs (\url{https://creativecommons.org are also admitted}). \ No newline at end of file +though Creative Commons URLs (\url{https://creativecommons.org}) are also admitted. \ No newline at end of file diff --git a/vo-dml/desc/desc.origin.QueryOrigin.request.txt b/vo-dml/desc/desc.origin.QueryOrigin.request.txt index 2e3acf4..53b6baa 100644 --- a/vo-dml/desc/desc.origin.QueryOrigin.request.txt +++ b/vo-dml/desc/desc.origin.QueryOrigin.request.txt @@ -1,3 +1,4 @@ Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. -For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. The format is free for others request types. \ No newline at end of file +For TAP queries, use the /sync UWS \citep{2016ivoa.spec.1024H} URL. +The format is free for other request types. \ No newline at end of file diff --git a/vo-dml/desc/desc.origin.txt b/vo-dml/desc/desc.origin.txt index f761fd9..c0c48a9 100644 --- a/vo-dml/desc/desc.origin.txt +++ b/vo-dml/desc/desc.origin.txt @@ -1,3 +1,3 @@ Package grouping together all the components needed to model the origin of the \texttt{MangoObject} (fig \ref{fig:origin}). The design of the package complies with the work of the DCP interest -group (see \url{https://ivoa.net/documents/DataOrigin/index.html}) \ No newline at end of file +group (see \url{https://ivoa.net/documents/DataOrigin/index.html}). \ No newline at end of file