diff --git a/doc/MANGO.tex b/doc/MANGO.tex index ebe1f34..0c24214 100644 --- a/doc/MANGO.tex +++ b/doc/MANGO.tex @@ -537,51 +537,6 @@ \subsection{Requirements} \end{itemize} -%\subsubsection{Properties and Associated Data} -% From the use-cases description, several categories of features must provided or foreseen by the projects: -% -% \begin{itemize} -% \item The source \emph{properties} astronomers will investigate for their science. -% They are measures provided as numerical values or classification tags exposed as -% numbers or simple strings. -% Usually one measure corresponds to one individual column or one group of columns. -% -% \item MANGO objects can be linked to external data referenced by WEB endpoints. -% % Such links are considered as object properties for which the model provides -% an accurate way to specify the nature of these links. -% Usually object links are provided by DataLinks services, -% then this MANGO feature is proposed to annotate datasets issued by services -% that do not implement such services but provide URLs in their query responses. -% -% \item MANGO objects can be linked to other collections of MANGO objects, -% associating sources with their detections, for example. -% \end{itemize} - - -%\subsubsection{Supported Quantities} -%\begin{itemize}[noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt] - % \item MANGO must provide unique source identifiers. - % \item MANGO must provide information about the source origin. - % \item The number of parameters attached to a MANGO instance must be free. -%\end{itemize} - -%\subsubsection{Properties} -% -%\begin{itemize}[noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt] -% \item MANGO must support explicit classes, native or imported from IVOA data-models, for the most used properties. -% \item MANGO must provide a generic way to support properties that do not enter the above category. -% \item MANGO object must support multiple instances of the same property class. -% \item The presence of any property in MANGO instances must be optional. -% \item MANGO must provide a way to identify the role of each property. -% \item MANGO must provide a way to identify the purpose of linked properties. -% \item MANGO must provide a way to describe the meaning of flags or qualifiers. -% \item The role of each parameter should be machine-readable. -% \item It must be possible to group parameters in a free way. -% This allows for instance to tag properties with timestamps or flags. -% \item MANGO objects must support references to other MANGO objects. -% \end{itemize} - - \section{Model Overview} @@ -638,7 +593,8 @@ \subsubsection{Property Identification} \subsubsection{MANGO and MIVOT: Structuring Tabular Data} -MANGO is primarily used to organise tabular data provided by TAP services \citep{2019ivoa.spec.0927D}. +MANGO is primarily used to organise tabular data provided by TAP services \citep{2019ivoa.spec.0927D} +other DAL nodes (one of the reference implementation is based on a Vizier SCS). To achieve this, table rows must be linked to the model using MIVOT annotations. We propose two strategies for establishing this mapping: \begin{itemize}[noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt] diff --git a/doc/Makefile b/doc/Makefile index 6f9c5a7..cec44e0 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -7,7 +7,7 @@ DOCNAME = MANGO DOCVERSION = 0.1 # Publication date, ISO format; update manually for "releases" -DOCDATE = 2024-09-26 +DOCDATE = 2024-10-03 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN DOCTYPE = WD diff --git a/doc/ivoatexmeta.tex b/doc/ivoatexmeta.tex index 515e12e..ecea21e 100644 --- a/doc/ivoatexmeta.tex +++ b/doc/ivoatexmeta.tex @@ -1,7 +1,7 @@ % GENERATED FILE -- edit this in the Makefile \newcommand{\ivoaDocversion}{0.1} -\newcommand{\ivoaDocdate}{2024-09-26} -\newcommand{\ivoaDocdatecode}{20240926} +\newcommand{\ivoaDocdate}{2024-10-03} +\newcommand{\ivoaDocdatecode}{20241003} \newcommand{\ivoaDoctype}{WD} \newcommand{\ivoaDocname}{MANGO} \renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO} diff --git a/doc/model.tex b/doc/model.tex index d8c4c5b..cdbaacf 100644 --- a/doc/model.tex +++ b/doc/model.tex @@ -34,7 +34,7 @@ \section{Model: mango } %\end{center} %\end{figure} - MO-del for AN-notating G-eneric O-bject + The purpose of MANGO, which stands for MO-del for AN-notating G-eneric O-objects, is to add an upper level of description to the tabular data of query responses. It allows metadata to be extended, complex quantities to be reconstructed from column values, and properties to be linked. It also allows to specify the origin af the data. \subsection{AssociatedMangoObject} \label{sect:AssociatedMangoObject} @@ -500,7 +500,7 @@ \section{Model: mango } \item[\textbf{STC\_S}]: \textbf{vodml-id:} ShapeFrame.STC\_S \newline \textbf{description:} MOC serialization \item[\textbf{MOC}]: \textbf{vodml-id:} ShapeFrame.MOC \newline - \textbf{description:} STCs serialization + \textbf{description:} MOC serialization \end{itemize} \normalsize @@ -518,7 +518,7 @@ \section{Model: mango } \item[\textbf{MOC}]: \textbf{vodml-id:} ShapeSerialization.MOC \newline \textbf{description:} Label indicating that the shape has been serialized as a S-MOC \item[\textbf{STCS}]: \textbf{vodml-id:} ShapeSerialization.STCS \newline - \textbf{description:} Label indicating that the shape has been serialized as a STCS string + \textbf{description:} Label indicating that the shape has been serialized as a STC-S \citep{2007ivoa.spec.1030R} string \item[\textbf{POLYGON}]: \textbf{vodml-id:} ShapeSerialization.POLYGON \newline \textbf{description:} Label indicating that the shape has been serialized as a polygon (cf xtypes) \end{itemize} @@ -703,8 +703,8 @@ \section{Package: dataorigin } \textbf{multiplicity: 1} \newline Name of the article editor - \subsubsection{Article.article} - \textbf{vodml-id: dataorigin.Article.article} \newline + \subsubsection{Article.code} + \textbf{vodml-id: dataorigin.Article.code} \newline \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline \textbf{multiplicity: 1} \newline Bibcode or DOI of the reference article diff --git a/mivot/desc/desc.AssociatedMangoObject.xml b/mivot/desc/desc.AssociatedMangoObject.xml deleted file mode 100644 index adfedc7..0000000 --- a/mivot/desc/desc.AssociatedMangoObject.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/mivot/desc/desc.BitField.xml b/mivot/desc/desc.BitField.xml deleted file mode 100644 index 20ad31c..0000000 --- a/mivot/desc/desc.BitField.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/mivot/desc/desc.Color.xml b/mivot/desc/desc.Color.xml deleted file mode 100644 index 65133b1..0000000 --- a/mivot/desc/desc.Color.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/mivot/desc/desc.ColorDef.xml b/mivot/desc/desc.ColorDef.xml deleted file mode 100644 index a733347..0000000 --- a/mivot/desc/desc.ColorDef.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/mivot/desc/desc.DataLink.xml b/mivot/desc/desc.DataLink.xml deleted file mode 100644 index 9d359e1..0000000 --- a/mivot/desc/desc.DataLink.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/mivot/desc/desc.EpochPosition.xml b/mivot/desc/desc.EpochPosition.xml deleted file mode 100644 index 7e63fee..0000000 --- a/mivot/desc/desc.EpochPosition.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/mivot/desc/desc.EpochPositionCorrelations.xml b/mivot/desc/desc.EpochPositionCorrelations.xml deleted file mode 100644 index 34588d5..0000000 --- a/mivot/desc/desc.EpochPositionCorrelations.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/mivot/desc/desc.EpochPositionErrors.xml b/mivot/desc/desc.EpochPositionErrors.xml deleted file mode 100644 index f656da5..0000000 --- a/mivot/desc/desc.EpochPositionErrors.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/mivot/desc/desc.Label.xml b/mivot/desc/desc.Label.xml deleted file mode 100644 index c741274..0000000 --- a/mivot/desc/desc.Label.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/mivot/desc/desc.MangoObject.xml b/mivot/desc/desc.MangoObject.xml deleted file mode 100644 index f6430da..0000000 --- a/mivot/desc/desc.MangoObject.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/mivot/desc/desc.PhotometricProperty.xml b/mivot/desc/desc.PhotometricProperty.xml deleted file mode 100644 index 0788ea0..0000000 --- a/mivot/desc/desc.PhotometricProperty.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/mivot/desc/desc.PhysicalProperty.xml b/mivot/desc/desc.PhysicalProperty.xml deleted file mode 100644 index ff5f06d..0000000 --- a/mivot/desc/desc.PhysicalProperty.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/mivot/desc/desc.Property.xml b/mivot/desc/desc.Property.xml deleted file mode 100644 index 0b04133..0000000 --- a/mivot/desc/desc.Property.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/mivot/desc/desc.Shape.xml b/mivot/desc/desc.Shape.xml deleted file mode 100644 index 34c2401..0000000 --- a/mivot/desc/desc.Shape.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/mivot/desc/desc.Status.xml b/mivot/desc/desc.Status.xml deleted file mode 100644 index 441a34e..0000000 --- a/mivot/desc/desc.Status.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/mivot/desc/desc.StatusValue.xml b/mivot/desc/desc.StatusValue.xml deleted file mode 100644 index 9d69ad5..0000000 --- a/mivot/desc/desc.StatusValue.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/mivot/desc/desc.StatusValues.xml b/mivot/desc/desc.StatusValues.xml deleted file mode 100644 index 8814edb..0000000 --- a/mivot/desc/desc.StatusValues.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/mivot/desc/desc.VocabularyTerm.xml b/mivot/desc/desc.VocabularyTerm.xml deleted file mode 100644 index f5e5b75..0000000 --- a/mivot/desc/desc.VocabularyTerm.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/mivot/desc/desc.dataorigin.Article.xml b/mivot/desc/desc.dataorigin.Article.xml deleted file mode 100644 index 47ce353..0000000 --- a/mivot/desc/desc.dataorigin.Article.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/mivot/desc/desc.dataorigin.DataOrigin.xml b/mivot/desc/desc.dataorigin.DataOrigin.xml deleted file mode 100644 index f1881f9..0000000 --- a/mivot/desc/desc.dataorigin.DataOrigin.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/mivot/desc/desc.dataorigin.License.xml b/mivot/desc/desc.dataorigin.License.xml deleted file mode 100644 index f354255..0000000 --- a/mivot/desc/desc.dataorigin.License.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/mivot/desc/desc.dataorigin.QueryOrigin.xml b/mivot/desc/desc.dataorigin.QueryOrigin.xml deleted file mode 100644 index bad507a..0000000 --- a/mivot/desc/desc.dataorigin.QueryOrigin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/mivot/desc/desc.error.Ellipse.xml b/mivot/desc/desc.error.Ellipse.xml deleted file mode 100644 index a3702f7..0000000 --- a/mivot/desc/desc.error.Ellipse.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/mivot/desc/desc.error.ErrorCorrMatrix.xml b/mivot/desc/desc.error.ErrorCorrMatrix.xml deleted file mode 100644 index db561f8..0000000 --- a/mivot/desc/desc.error.ErrorCorrMatrix.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/mivot/desc/desc.error.ErrorCovMatrix.xml b/mivot/desc/desc.error.ErrorCovMatrix.xml deleted file mode 100644 index 23b0f59..0000000 --- a/mivot/desc/desc.error.ErrorCovMatrix.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/mivot/desc/desc.error.PropertyError1D.xml b/mivot/desc/desc.error.PropertyError1D.xml deleted file mode 100644 index 0fba519..0000000 --- a/mivot/desc/desc.error.PropertyError1D.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/mivot/mango/mango.AssociatedMangoObject.xml b/mivot/mango/mango.AssociatedMangoObject.xml new file mode 100644 index 0000000..f7d8250 --- /dev/null +++ b/mivot/mango/mango.AssociatedMangoObject.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.BitField.xml b/mivot/mango/mango.BitField.xml new file mode 100644 index 0000000..95a7ccc --- /dev/null +++ b/mivot/mango/mango.BitField.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.Color.xml b/mivot/mango/mango.Color.xml new file mode 100644 index 0000000..8befbf4 --- /dev/null +++ b/mivot/mango/mango.Color.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.ColorDef.xml b/mivot/mango/mango.ColorDef.xml new file mode 100644 index 0000000..4377643 --- /dev/null +++ b/mivot/mango/mango.ColorDef.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/mivot/mango/mango.DataLink.xml b/mivot/mango/mango.DataLink.xml new file mode 100644 index 0000000..c183191 --- /dev/null +++ b/mivot/mango/mango.DataLink.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/mivot/mango/mango.EpochPosition.xml b/mivot/mango/mango.EpochPosition.xml new file mode 100644 index 0000000..134b11d --- /dev/null +++ b/mivot/mango/mango.EpochPosition.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.EpochPositionCorrelations.xml b/mivot/mango/mango.EpochPositionCorrelations.xml new file mode 100644 index 0000000..5180811 --- /dev/null +++ b/mivot/mango/mango.EpochPositionCorrelations.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.EpochPositionErrors.xml b/mivot/mango/mango.EpochPositionErrors.xml new file mode 100644 index 0000000..9d209af --- /dev/null +++ b/mivot/mango/mango.EpochPositionErrors.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.Label.xml b/mivot/mango/mango.Label.xml new file mode 100644 index 0000000..9408905 --- /dev/null +++ b/mivot/mango/mango.Label.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/mivot/mango/mango.MangoObject.xml b/mivot/mango/mango.MangoObject.xml new file mode 100644 index 0000000..8982464 --- /dev/null +++ b/mivot/mango/mango.MangoObject.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.PhotometricProperty.xml b/mivot/mango/mango.PhotometricProperty.xml new file mode 100644 index 0000000..181af78 --- /dev/null +++ b/mivot/mango/mango.PhotometricProperty.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/mivot/mango/mango.PhysicalProperty.xml b/mivot/mango/mango.PhysicalProperty.xml new file mode 100644 index 0000000..0f1bc6f --- /dev/null +++ b/mivot/mango/mango.PhysicalProperty.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/mivot/mango/mango.Property.xml b/mivot/mango/mango.Property.xml new file mode 100644 index 0000000..53c880c --- /dev/null +++ b/mivot/mango/mango.Property.xml @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/mivot/mango/mango.Shape.xml b/mivot/mango/mango.Shape.xml new file mode 100644 index 0000000..abdfe56 --- /dev/null +++ b/mivot/mango/mango.Shape.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.Status.xml b/mivot/mango/mango.Status.xml new file mode 100644 index 0000000..427b260 --- /dev/null +++ b/mivot/mango/mango.Status.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/mivot/mango/mango.StatusValue.xml b/mivot/mango/mango.StatusValue.xml new file mode 100644 index 0000000..d0688b8 --- /dev/null +++ b/mivot/mango/mango.StatusValue.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mivot/mango/mango.StatusValues.xml b/mivot/mango/mango.StatusValues.xml new file mode 100644 index 0000000..f46c662 --- /dev/null +++ b/mivot/mango/mango.StatusValues.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/mivot/mango/mango.VocabularyTerm.xml b/mivot/mango/mango.VocabularyTerm.xml new file mode 100644 index 0000000..7b5adf3 --- /dev/null +++ b/mivot/mango/mango.VocabularyTerm.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mivot/mango/mango.dataorigin.Article.xml b/mivot/mango/mango.dataorigin.Article.xml new file mode 100644 index 0000000..957b601 --- /dev/null +++ b/mivot/mango/mango.dataorigin.Article.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mivot/mango/mango.dataorigin.DataOrigin.xml b/mivot/mango/mango.dataorigin.DataOrigin.xml new file mode 100644 index 0000000..5716a2a --- /dev/null +++ b/mivot/mango/mango.dataorigin.DataOrigin.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/mivot/mango/mango.dataorigin.License.xml b/mivot/mango/mango.dataorigin.License.xml new file mode 100644 index 0000000..0b69074 --- /dev/null +++ b/mivot/mango/mango.dataorigin.License.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/mivot/mango/mango.dataorigin.QueryOrigin.xml b/mivot/mango/mango.dataorigin.QueryOrigin.xml new file mode 100644 index 0000000..60b7628 --- /dev/null +++ b/mivot/mango/mango.dataorigin.QueryOrigin.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/mivot/mango/mango.error.Ellipse.xml b/mivot/mango/mango.error.Ellipse.xml new file mode 100644 index 0000000..de51379 --- /dev/null +++ b/mivot/mango/mango.error.Ellipse.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/mivot/mango/mango.error.ErrorCorrMatrix.xml b/mivot/mango/mango.error.ErrorCorrMatrix.xml new file mode 100644 index 0000000..9365792 --- /dev/null +++ b/mivot/mango/mango.error.ErrorCorrMatrix.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/mivot/mango/mango.error.ErrorCovMatrix.xml b/mivot/mango/mango.error.ErrorCovMatrix.xml new file mode 100644 index 0000000..247e643 --- /dev/null +++ b/mivot/mango/mango.error.ErrorCovMatrix.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/mivot/mango/mango.error.PropertyError1D.xml b/mivot/mango/mango.error.PropertyError1D.xml new file mode 100644 index 0000000..633924c --- /dev/null +++ b/mivot/mango/mango.error.PropertyError1D.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/model/DataOrigin.png b/model/DataOrigin.png index 93e5271..8207459 100644 Binary files a/model/DataOrigin.png and b/model/DataOrigin.png differ diff --git a/model/mango.xmi b/model/mango.xmi index be9c54e..7cf3f73 100644 --- a/model/mango.xmi +++ b/model/mango.xmi @@ -1,693 +1,693 @@ - - - - - + + + + + - - MO-del for AN-notating G-eneric O-bject + + The purpose of MANGO, which stands for MO-del for AN-notating G-eneric O-objects, is to add an upper level of description to the tabular data of query responses. It allows metadata to be extended, complex quantities to be reconstructed from column values, and properties to be linked. It also allows to specify the origin af the data. - - + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - - - - - + + + + + + + - - + + - - - - - - + + + + + + <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 - - - + + + - - + + Possible options to encode a shape in a string. - - + + STCs serialisation - - + + MOC serialisation - - - - + + + + - + - - + + - - - + + + - - - - + + + + - - + + - - - - - + + + + + - + - - - - + + + + - - - + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + Science ready data with the instrument signature removed (ObsCore). - - + + Raw instrumental data, in a proprietary or internal data provider defined format, that needs instrument specific tools to be handled (ObsCore). - - + + Instrumental data in a standard format which could be manipulated with standard astronomical packages (ObsCore). - - + + Science ready data with the instrument signature removed (ObsCore). - - + + 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. - - + + Parallax error. This error is meant to be symetrical. - + - - + + Error in the radial velocity. This error is meant to be symetrical. - + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + 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. - - + + Diagonal 2D matrix. Non diagonal elements are null. - - - + + + First diagonal element ($(x_11)$) - - + + Second diagonal element ($(x_22)$) - + - - + + 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 - + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + Class representing the origin of the data following the DCP note (TBD) - - + + - - + + - - + + - - + + Dataset idnetifier that can be used for citation (e.g. DOI) - - + + Dataset landing page - - + + Dataset version - - + + Person(s) mainly involved in the creation of the resource, generally the author. - - + + Identifier (IVOID, DOI or Bibcode) of a second resource using relation of type \texttt{cites} (\url{https://www.ivoa.net/rdf/voresource/relationship_type/}) - - + + Identifier (IVOID, DOI or Bibcode) of a second resource using relation of type \texttt{is_derived_from} (\url{https://www.ivoa.net/rdf/voresource/relationship_type/}) - - + + Date of the original resource from which the MANGO source instance is derived - - - + + + - - - + + + - - - + + + - - + + Reference article for the MANGO source - - + + Article editor name - - + + Bibcode or DOI of the reference article - - - + + + IVOID of the underlying data collection - - + + Data center that produced the MANGOI source instance - - + + Version of the software the produced the MANO source instance. It is encouraged to follow \url{https://ivoa.net/documents/Notes/softid/index.html}. - - + + IVOID of the protocol through which the data was retrieved - - + + 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 URL. The format is free for others request types. - - + + Input query in a formal langage such as ADQL. - - + + Query execution date - - + + Email or URL to contact the publisher - - + + Place holder for the license covering the MANGO instance - - + + 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. - - + + License or Copyright text - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/model/overview.png b/model/overview.png index ba94644..0279704 100644 Binary files a/model/overview.png and b/model/overview.png differ diff --git a/utils/buildDoc.bash b/utils/buildDoc.bash index ac88191..014034d 100755 --- a/utils/buildDoc.bash +++ b/utils/buildDoc.bash @@ -3,8 +3,24 @@ echo "build VODML" python -m processVodml +echo "build MIVOT snippets" + +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/ + rm ./mango.vo-dml.xml +else + echo "mivot-snippet-model not found: have you 'pip install mivot-validator'" +fi + cd ../doc echo "compile latex" rm *.aux make forcetex + + cd ../utils + + diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml index 6d827a9..f9a07fe 100644 --- a/vo-dml/desc.mango.vo-dml.xml +++ b/vo-dml/desc.mango.vo-dml.xml @@ -1,13 +1,13 @@ mango - MO-del for AN-notating G-eneric O-bject + The purpose of MANGO, which stands for MO-del for AN-notating G-eneric O-objects, is to add an upper level of description to the tabular data of query responses. It allows metadata to be extended, complex quantities to be reconstructed from column values, and properties to be linked. It also allows to specify the origin af the data. Mango Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado 1.0 0.0 - 2024-09-26T17:14:07 + 2024-10-10T16:47:26 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -41,7 +41,7 @@ ShapeFrame.MOC MOC - STCs serialization + MOC serialization @@ -57,7 +57,7 @@ ShapeSerialization.STCS STCS - Label indicating that the shape has been serialized as a STCS string + Label indicating that the shape has been serialized as a STC-S \citep{2007ivoa.spec.1030R} string ShapeSerialization.POLYGON @@ -1428,8 +1428,8 @@ The correlation matrix is symmetrical. - dataorigin.Article.article - article + dataorigin.Article.code + code Bibcode or DOI of the reference article ivoa:string diff --git a/vo-dml/desc/desc.dataorigin.Article.article.txt b/vo-dml/desc/desc.dataorigin.Article.code.txt similarity index 100% rename from vo-dml/desc/desc.dataorigin.Article.article.txt rename to vo-dml/desc/desc.dataorigin.Article.code.txt diff --git a/vo-dml/mango.png b/vo-dml/mango.png index e0b9282..d85f9fe 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 0415a75..939c6c5 100644 --- a/vo-dml/mango.vo-dml.xml +++ b/vo-dml/mango.vo-dml.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ivoa.net/xml/VODML/v1 http://www.ivoa.net/xml/VODML/vo-dml-v1.xsd"> mango - MO-del for AN-notating G-eneric O-bject + The purpose of MANGO, which stands for MO-del for AN-notating G-eneric O-objects, is to add an upper level of description to the tabular data of query responses. It allows metadata to be extended, complex quantities to be reconstructed from column values, and properties to be linked. It also allows to specify the origin af the data. Mango Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado 1.0 0.0 - 2024-09-26T17:14:07 + 2024-10-10T16:47:26 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -1484,8 +1484,8 @@ As long as the vocabulary is not set, the possible values of this attribute are - dataorigin.Article.article - article + dataorigin.Article.code + code Bibcode or DOI of the reference article ivoa:string