diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 29bc580..0421779 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -16,7 +16,7 @@ env: on: push: branches: - - brigita_review + - final-review - pr-1.0 jobs: diff --git a/doc/MANGO.tex b/doc/MANGO.tex index 887de28..2d364b9 100644 --- a/doc/MANGO.tex +++ b/doc/MANGO.tex @@ -252,11 +252,11 @@ \section{Model Overview} Identifiers should be unique within a collection, e.g. a data table, although this feature is not required by the model. -In addition to its identifier, \texttt{MangoObject} objects have 2 components: +In addition to their identifier, \texttt{MangoObject} objects have 2 elements : \begin{itemize}[noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt] - \item \texttt{queryOrigin} (origin of the \texttt{MangoObject}) : The structure of this class is based on + \item \texttt{queryOrigin} (reference to the origin of the \texttt{MangoObject}) : The structure of this class is based on the recommendations of the DCP interest group \footnote{https://ivoa.net/documents/DataOrigin/index.html}. \item \texttt{propertyDock} (place holder for all the \texttt{MangoObject} properties) : This is an open-ended collection. diff --git a/doc/Makefile b/doc/Makefile index 50950b3..878ab37 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-02-26 +DOCDATE = 2026-03-05 # 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 43f3ece..4b5bb72 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-02-26} -\newcommand{\ivoaDocdatecode}{20260226} +\newcommand{\ivoaDocdate}{2026-03-05} +\newcommand{\ivoaDocdatecode}{20260305} \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 8242225..af5dcf4 100644 --- a/doc/model.tex +++ b/doc/model.tex @@ -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 The epoch of \texttt{coords:SpaceSys} is for the epoch of the reference location position, not for the measurement epoch. \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 @@ -220,7 +220,7 @@ \section{Model: mango } \textbf{vodml-id: EpochPosition.obsDate} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:datetime}} \newline \textbf{multiplicity: 1} \newline - Observation date expressed within the common time system if present. This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system (see the above). Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates. + Observation date expressed within the common time system if present. Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates. \subsubsection{EpochPosition.pmCosLatApplied} \textbf{vodml-id: EpochPosition.pmCosLatApplied} \newline @@ -402,13 +402,13 @@ \section{Model: mango } \textbf{vodml-id: MangoObject.mangoObjects} \newline \textbf{type: \hyperref[sect:AssociatedMangoObject]{mango:AssociatedMangoObject}} \newline \textbf{multiplicity: 0..*} \newline - Reference to particular datasets (\texttt{mango:MangoObject} instances) that are associated with the MANGO object via \texttt{mango:AssociatedMangoObject} instances. + Collection of particular datasets (\texttt{mango:MangoObject} instances) that are associated with the MANGO object via \texttt{mango:AssociatedMangoObject} instances. \subsubsection{MangoObject.queryOrigin} \textbf{vodml-id: MangoObject.queryOrigin} \newline \textbf{type: \hyperref[sect:origin.QueryOrigin]{mango:origin.QueryOrigin}} \newline \textbf{multiplicity: 0..1} \newline - Reference to the description of the origin of the \texttt{MangoObject}. + Reference to the description of the origin of the dataset to which the \texttt{MangoObject} belongs. \subsection{PhysicalProperty} \label{sect:PhysicalProperty} @@ -586,7 +586,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. Mango errors all have an attribute that specifies the confidence level. \subsection{PErrorAsym1D} \label{sect:error.PErrorAsym1D} @@ -654,7 +654,7 @@ \section{Package: error } \subsection{PropertyError (Abstract)} \label{sect:error.PropertyError} - Root (abstract) class of the errors that can be attached to a MANGO property. The class inherits from \texttt{meas:uncertainty} in order to be usable in the context of properties based on \texttt{Measures} classes. + Root (abstract) class of the errors that can be attached to a MANGO property. \subsubsection{PropertyError.confidenceLevel} \textbf{vodml-id: error.PropertyError.confidenceLevel} \newline diff --git a/doc/model_toc.tex b/doc/model_toc.tex index bd18c58..bedb298 100644 --- a/doc/model_toc.tex +++ b/doc/model_toc.tex @@ -23,13 +23,13 @@ \section{Model: mango} \textbf{vodml-id: MangoObject.mangoObjects} \newline \textbf{type: \hyperref[sect:AssociatedMangoObject]{mango:AssociatedMangoObject}} \newline \textbf{multiplicity: 0..*} \newline - Reference to particular datasets (\texttt{mango:MangoObject} instances) that are associated with the MANGO object via \texttt{mango:AssociatedMangoObject} instances. + Collection of particular datasets (\texttt{mango:MangoObject} instances) that are associated with the MANGO object via \texttt{mango:AssociatedMangoObject} instances. \subsubsection{MangoObject.queryOrigin} \textbf{vodml-id: MangoObject.queryOrigin} \newline \textbf{type: \hyperref[sect:origin.QueryOrigin]{mango:origin.QueryOrigin}} \newline \textbf{multiplicity: 0..1} \newline - Reference to the description of the origin of the \texttt{MangoObject}. + Reference to the description of the origin of the dataset to which the \texttt{MangoObject} belongs. \subsection{AssociatedMangoObject} \label{sect:AssociatedMangoObject} @@ -133,7 +133,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 The epoch of \texttt{coords:SpaceSys} is for the epoch of the reference location position, not for the measurement epoch. \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 @@ -175,7 +175,7 @@ \section{Epoch Position Properties} \textbf{vodml-id: EpochPosition.obsDate} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:datetime}} \newline \textbf{multiplicity: 1} \newline - Observation date expressed within the common time system if present. This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system (see the above). Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates. + Observation date expressed within the common time system if present. Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates. \subsubsection{EpochPosition.pmCosLatApplied} \textbf{vodml-id: EpochPosition.pmCosLatApplied} \newline @@ -514,11 +514,11 @@ \section{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. Mango errors all have an attribute that specifies the confidence level. \subsection{PropertyError (Abstract)} \label{sect:error.PropertyError} - Root (abstract) class of the errors that can be attached to a MANGO property. The class inherits from \texttt{meas:uncertainty} in order to be usable in the context of properties based on \texttt{Measures} classes. + Root (abstract) class of the errors that can be attached to a MANGO property. \subsubsection{PropertyError.confidenceLevel} \textbf{vodml-id: error.PropertyError.confidenceLevel} \newline diff --git a/doc/usecases.tex b/doc/usecases.tex index 55209e1..4591e59 100644 --- a/doc/usecases.tex +++ b/doc/usecases.tex @@ -199,7 +199,7 @@ \subsubsection{Client Use-cases} \item does this table contain sky positions, or HEALPix tiles, or both? What's the best way to represent it on the sky? - \item what is the meaning of such URL found out in a tables? + \item what is the meaning of the URL stored in a table column? \end{itemize} But there are some other cases like: diff --git a/model/EpochPosition.png b/model/EpochPosition.png index 567c458..2eec0e9 100644 Binary files a/model/EpochPosition.png and b/model/EpochPosition.png differ diff --git a/model/error.png b/model/error.png index f06d52e..d0ac2f4 100644 Binary files a/model/error.png and b/model/error.png differ diff --git a/model/mango.xmi b/model/mango.xmi index b7d30e9..fb9bb21 100644 --- a/model/mango.xmi +++ b/model/mango.xmi @@ -1,552 +1,548 @@ - - - - - + + + + + - + The purpose of MANGO is to provide a higher level of description for multi-attribute properties. When used with MIVOT annotations, it enables tabular data to be represented as structured objects. This enables the metadata representation to be improved and complex quantities to be reconstructed from column values. Modelled properties can be linked to each other. MANGO also enables the origin of the data to be specified. - - - - - + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - - - - - + + + + + + <Enter note text here> - - - - - + + + + + - - + + - - + + - - + + Root class of the model. MANGO instances are meant of be Source instances. A source is something with an identifier and two docks: one for the parameters and one for the associated data. - - + + Composition link pointing on all parameters attached to the source. - - + + - - - + + - - + + + - - + + Unique identifier for a Source. The uniqueness of that identifier is not managed by the model. The format is free. - - + + - - + + - - + + Class for associated data referenced by an URL - - - + + + Mime type of the URL - - + + Web endpoint - - + + - - + + Reference to another MANGO instance that is part of the associated data. - - - Composition link pointing on one MANGO instance associated with the source. - - - - + + + Reference to a semantic concept giving the nature of the associated data. As long as the vocabulary is not set, the possible values of this attribute are given by the LinkSemantic enumeration. - - + + Free text description of the associated data - - + + - - + + Reference to a particular measure of the Source. This class is used to specify the type of the measure as well as its role. - - + + <Enter note text here> - - + + - - + + Reference to a semantic concept giving the nature of the parameter As long as the vocabulary is not set, the possible values of this attribute are given by the ParamSemantic enumeration. - + - - + + Free text description of the measure - + - - - + + + - - - - + + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - + + Class grouping all parameters needed to define an object position at a given epoch. The space coordinate system is common to all attributes to insure the consistance between all of the instance parameters. - - - - + + + + - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + Class for the error attached to a EpochPosition. The component in this class represent the errors of individual parameters as well as errors due to the parameter correlations. - - - - - - - - + + + + + + + + Root (abstract) class of the errors that can be attached to a MA?GO property. The class inherit from \texttt{meas:uncertainty} in order to be usable in the context of properties based on \texttt{Measures} classes. - - + + Confidence level of the error, expressed in \sigma. - + - - + + Symetrical error for 1D parameter. - - - + + + Error amplitude. - - + + Elliptical errror for 2D parameters such as the sky positions. - - - + + + Half of the ellipse major axis. - - + + Half of the ellipse minor axis. - - + + Angle between the North Polar Cape (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. - - - - + + + + - - - - + + + + - - - + + + Difference of mangnitudes: typically $M_B - M_v$ - - + + Normalized ratio of fluxes: $(F_{EB2} - F_{EB1}) / (F_{EB2} + F_{EB1})$ - - - + + + - - + + - - + + - - + + - - + + - - + + <Enter note text here>s - + - - + + - - + + - - + + - - + + - - + + - - - + + + - - + + Reference article for the MANGO source - - + + Article editor name - - + + Bibcode or DOI of the reference article - - - - + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + License or Copyright text - - + + Licence URI following the regostry practice. This should come from SPDX \url{https://spdx.org/licenses}. Creatives Commons (\url{https://creativecommons.org}) are also accepted. - - + + - - - - + + + + - - - + + + - - - - - - + + + + + + - - + + - - - - - - + + + + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/model/origin.png b/model/origin.png index d5d9f5d..db53de2 100644 Binary files a/model/origin.png and b/model/origin.png differ diff --git a/model/overview.png b/model/overview.png index ac8006b..60a4911 100644 Binary files a/model/overview.png and b/model/overview.png differ diff --git a/model/property.png b/model/property.png index 0f127fe..0d75d06 100644 Binary files a/model/property.png and b/model/property.png differ diff --git a/utils/buildDoc.bash b/utils/buildDoc.bash index 976f32c..a7ab26a 100755 --- a/utils/buildDoc.bash +++ b/utils/buildDoc.bash @@ -20,7 +20,7 @@ which mivot-snippet-model if [[ $? -eq 0 ]]; then [ -e ../mivot/mango ] && rm -rf ../mivot/mango cp ../vo-dml/desc.mango.vo-dml.xml ./mango.vo-dml.xml - mivot-snippet-model file://`pwd`/mango.vo-dml.xml `pwd`/../mivot/ + #mivot-snippet-model file://`pwd`/mango.vo-dml.xml `pwd`/../mivot/ if [ $? -ne 0 ]; then echo "error in snippet building" exit 1 diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml index e2d36a0..6d4e05c 100644 --- a/vo-dml/desc.mango.vo-dml.xml +++ b/vo-dml/desc.mango.vo-dml.xml @@ -9,7 +9,7 @@ This enables the metadata representation to be improved and complex quantities t Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado 1.0 0.0 - 2026-02-26T14:48:02 + 2026-03-04T09:51:16 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -255,10 +255,10 @@ The format is free. -1 - + MangoObject.mangoObjects mangoObjects - Reference to particular datasets (\texttt{mango:MangoObject} instances) that are associated with + Collection of particular datasets (\texttt{mango:MangoObject} instances) that are associated with the MANGO object via \texttt{mango:AssociatedMangoObject} instances. @@ -268,11 +268,11 @@ the MANGO object via \texttt{mango:AssociatedMangoObject} instances. 0 -1 - + MangoObject.queryOrigin queryOrigin - Reference to the description of the origin of the \texttt{MangoObject}. + Reference to the description of the origin of the dataset to which the \texttt{MangoObject} belongs. mango:origin.QueryOrigin @@ -383,7 +383,7 @@ semantics, content_type and content_qualifier is not sufficient (see DataLink 1. 1 - + AssociatedMangoObject.mangoObject mangoObject Reference to the associated \texttt{MangoObject}. @@ -394,7 +394,7 @@ semantics, content_type and content_qualifier is not sufficient (see DataLink 1. 1 1 - + @@ -785,9 +785,8 @@ It is recommended to use the \texttt{ObsDate} field to store the epoch of the ob 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 epoch of \texttt{coords:SpaceSys} is for the epoch of the reference location position, + not for the measurement epoch. \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. @@ -909,7 +908,6 @@ but applied to the \texttt{mango:EpochPosition} context. EpochPosition.obsDate obsDate Observation date expressed within the common time system if present. -This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system (see the above). Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates. @@ -1233,15 +1231,11 @@ It must be an instance of \texttt{photdm:PhotCal}. error error 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. +Mango errors all have an attribute that specifies the confidence level. error.PropertyError PropertyError - Root (abstract) class of the errors that can be attached to a MANGO property. -The class inherits from \texttt{meas:uncertainty} in order to be usable in the context -of properties based on \texttt{Measures} classes. + Root (abstract) class of the errors that can be attached to a MANGO property. error.PropertyError.confidenceLevel confidenceLevel diff --git a/vo-dml/desc/desc.EpochPosition.obsDate.txt b/vo-dml/desc/desc.EpochPosition.obsDate.txt index a7ee71f..9c54652 100644 --- a/vo-dml/desc/desc.EpochPosition.obsDate.txt +++ b/vo-dml/desc/desc.EpochPosition.obsDate.txt @@ -1,4 +1,3 @@ Observation date expressed within the common time system if present. -This attribute, if set, supersedes the epoch possibly given with the spatial coordinate system (see the above). Figure \ref{datetime} shows up the hierarchy of the primitive types representing the observation dates. diff --git a/vo-dml/desc/desc.EpochPosition.txt b/vo-dml/desc/desc.EpochPosition.txt index 2089b47..1b6ea1f 100644 --- a/vo-dml/desc/desc.EpochPosition.txt +++ b/vo-dml/desc/desc.EpochPosition.txt @@ -24,13 +24,12 @@ All components use the same coordinate systems for both time and space coordinat \end{itemize} -It is recommended to use the \texttt{ObsDate} field to store the epoch of the observation instead +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 epoch of \texttt{coords:SpaceSys} is for the epoch of the reference location position, + not for the measurement epoch. \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. diff --git a/vo-dml/desc/desc.MangoObject.mangoObjects.txt b/vo-dml/desc/desc.MangoObject.mangoObjects.txt index 97bca07..3dfeb2d 100644 --- a/vo-dml/desc/desc.MangoObject.mangoObjects.txt +++ b/vo-dml/desc/desc.MangoObject.mangoObjects.txt @@ -1,2 +1,2 @@ -Reference to particular datasets (\texttt{mango:MangoObject} instances) that are associated with +Collection of particular datasets (\texttt{mango:MangoObject} instances) that are associated with the MANGO object via \texttt{mango:AssociatedMangoObject} instances. diff --git a/vo-dml/desc/desc.MangoObject.queryOrigin.txt b/vo-dml/desc/desc.MangoObject.queryOrigin.txt index c273bba..5e1cd24 100644 --- a/vo-dml/desc/desc.MangoObject.queryOrigin.txt +++ b/vo-dml/desc/desc.MangoObject.queryOrigin.txt @@ -1 +1 @@ -Reference to the description of the origin of the \texttt{MangoObject}. +Reference to the description of the origin of the dataset to which the \texttt{MangoObject} belongs. diff --git a/vo-dml/desc/desc.error.PropertyError.txt b/vo-dml/desc/desc.error.PropertyError.txt index ad73cdb..cb635a5 100644 --- a/vo-dml/desc/desc.error.PropertyError.txt +++ b/vo-dml/desc/desc.error.PropertyError.txt @@ -1,3 +1 @@ -Root (abstract) class of the errors that can be attached to a MANGO property. -The class inherits from \texttt{meas:uncertainty} in order to be usable in the context -of properties based on \texttt{Measures} classes. \ No newline at end of file +Root (abstract) class of the errors that can be attached to a MANGO property. \ No newline at end of file diff --git a/vo-dml/desc/desc.error.txt b/vo-dml/desc/desc.error.txt index ae21978..fe8edbd 100644 --- a/vo-dml/desc/desc.error.txt +++ b/vo-dml/desc/desc.error.txt @@ -1,4 +1,2 @@ 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 +Mango errors all have an attribute that specifies the confidence level. \ No newline at end of file diff --git a/vo-dml/mango.png b/vo-dml/mango.png index cfbe150..9587bbc 100644 Binary files a/vo-dml/mango.png and b/vo-dml/mango.png differ diff --git a/vo-dml/mango.vo-dml.xml b/vo-dml/mango.vo-dml.xml index 45eff54..d3799a8 100644 --- a/vo-dml/mango.vo-dml.xml +++ b/vo-dml/mango.vo-dml.xml @@ -12,7 +12,7 @@ This enables the metadata representation to be improved and complex quantities t Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado 1.0 0.0 - 2026-02-26T14:48:02 + 2026-03-04T09:51:16 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -249,7 +249,7 @@ The format is free. -1 - + MangoObject.mangoObjects mangoObjects @@ -262,7 +262,7 @@ The format is free. 0 -1 - + MangoObject.queryOrigin queryOrigin @@ -370,10 +370,12 @@ As long as the vocabulary is not set, the possible values of this attribute are 1 - + AssociatedMangoObject.mangoObject mangoObject - Composition link pointing on one MANGO instance associated with the source. + + TODO : Missing description : please, update your UML model asap. + mango:MangoObject @@ -381,7 +383,7 @@ As long as the vocabulary is not set, the possible values of this attribute are 1 1 - +