Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/MANGO.tex
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,11 @@ \subsection{Properties}
\hline
\texttt{PhysicalProperty} & Hook for \texttt{Measure} classes & Model a columns as a time stamp \\
\hline
\texttt{Shape} & String serialization of shapes & Sky Coverage of a dust cloud \\
\texttt{Footprint} & String serialization of shapes & Sky Coverage of a dust cloud \\
\hline
\texttt{EpochPosition} & Grouping of position with velocity and time & Parameters to solve the epoch propagation case\\
\hline
\texttt{PhotometricProperty} & Flux or Magnitude & many \\
\texttt{Magnitude} & Flux or Magnitude & many \\
\hline
\texttt{Color} & Hardness ratio or magnitude ratio & many \\ [1ex]
\hline
Expand Down
2 changes: 1 addition & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DOCNAME = MANGO
DOCVERSION = 0.1

# Publication date, ISO format; update manually for "releases"
DOCDATE = 2025-06-02
DOCDATE = 2025-06-06

# What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
DOCTYPE = PR
Expand Down
4 changes: 2 additions & 2 deletions doc/ivoatexmeta.tex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% GENERATED FILE -- edit this in the Makefile
\newcommand{\ivoaDocversion}{0.1}
\newcommand{\ivoaDocdate}{2025-06-02}
\newcommand{\ivoaDocdatecode}{20250602}
\newcommand{\ivoaDocdate}{2025-06-06}
\newcommand{\ivoaDocdatecode}{20250606}
\newcommand{\ivoaDoctype}{PR}
\newcommand{\ivoaDocname}{MANGO}
\renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO}
22 changes: 9 additions & 13 deletions doc/model.tex
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ \section{Model: mango }
\textbf{multiplicity: 1} \newline
Reference to the associated \texttt{MangoObject}.

\subsection{BitField}
\label{sect:BitField}
Property for which each possible value is represented by a bit, so that multiple states can be contained in the same integer value. The possible values are defined in the associated \texttt{StatusValues}, which must correspond to a bit pattern (each value must be a power of 2). This constraint is not enforced by the model.

\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).
Expand Down Expand Up @@ -356,7 +352,7 @@ \section{Model: mango }

\subsection{Footprint}
\label{sect:Footprint}
Description of the spatial extent of the MANGO object (e.g. for dust clouds). Shape is serialized as a string. \begin{itemize} \item The supported serialization modes are listed in the \texttt{ShapeSerialization} enumeration. \item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference. \end{itemize}
Description of the spatial extent of the MANGO object (e.g. for dust clouds). Footprint is serialized as a string. \begin{itemize} \item The supported serialization modes are listed in the \texttt{ShapeSerialization} enumeration. \item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference. \end{itemize}

\subsubsection{Footprint.serialization}
\textbf{vodml-id: Footprint.serialization} \newline
Expand All @@ -374,7 +370,7 @@ \section{Model: mango }
\textbf{vodml-id: Footprint.spaceSys} \newline
\textbf{type: coords:SpaceSys} \newline
\textbf{multiplicity: 1} \newline
Coordinate system that applies for the shape
Coordinate system that applies for the footprint

\subsection{Label}
\label{sect:Label}
Expand Down Expand Up @@ -459,11 +455,11 @@ \section{Model: mango }

\subsection{Status}
\label{sect:Status}
Property representing a status defined by a integer number that can only take on a defined number of values, each with its own description. Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 for False and 1 for True.
Property representing a status defined by a string (numerical values must be down-casted) that can only take on a defined number of values, each with its own description.

\subsubsection{Status.status}
\textbf{vodml-id: Status.status} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
\textbf{multiplicity: 1} \newline
Actual value of the status

Expand All @@ -479,7 +475,7 @@ \section{Model: mango }

\subsubsection{StatusValue.value}
\textbf{vodml-id: StatusValue.value} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
\textbf{multiplicity: 1} \newline
Allowed value for a \texttt{Status}

Expand Down Expand Up @@ -518,19 +514,19 @@ \section{Model: mango }
\subsection{FootprintSerialization}
\label{sect:FootprintSerialization}

Enumeration of the supported serialization modes for the shapes
Enumeration of the supported serialization modes for the footprints

\noindent \underline{Enumeration Literals}
\vspace{-\parsep}
\small
\begin{itemize}

\item[\textbf{SMOC}]: \textbf{vodml-id:} FootprintSerialization.SMOC \newline
\textbf{description:} Label indicating that the shape has been serialized as a SMOC \citep{2022ivoa.spec.0727F}. SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\textbf{description:} Label indicating that the footprint has been serialized as a SMOC \citep{2022ivoa.spec.0727F}. SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\item[\textbf{STC-S}]: \textbf{vodml-id:} FootprintSerialization.STC-S \newline
\textbf{description:} Label indicating that the shape has been serialized as a STC-S string (see \url{https://www.ivoa.net/documents/STC-S/20130917/index.html}). SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\textbf{description:} Label indicating that the footprint has been serialized as a STC-S string (see \url{https://www.ivoa.net/documents/STC-S/20130917/index.html}). SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\item[\textbf{POLYGON}]: \textbf{vodml-id:} FootprintSerialization.POLYGON \newline
\textbf{description:} Label indicating that the shape has been serialized as a polygon as defined in \cite{2017ivoa.spec.0517D} section 3.3.7. Using the polygon serialization requires the space coordinate system to be defined.
\textbf{description:} Label indicating that the footprint has been serialized as a polygon as defined in \cite{2017ivoa.spec.0517D} section 3.3.7. Using the polygon serialization requires the space coordinate system to be defined.
\end{itemize}
\normalsize

Expand Down
26 changes: 10 additions & 16 deletions doc/model_toc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,7 @@ \section{Epoch Position Properties}
\textbf{multiplicity: 1} \newline
The timestamp value is always given as a string. The way to process this string is given by the representation mode. It can represent an ISO date or a real value (e.g. for MJD mjd timestamps).

\section{Photometric Properties}
This section brings together all the classes that model the photometric properties.
The definition of the photometric calibrations and the
photometric filters are imported from \texttt{PhotDM}.
\subsection{PhotometricProperty}
\section{Photometric and Spectroscopic Properties}

\subsection{Brightness}
\label{sect:Brightness}
Expand Down Expand Up @@ -430,11 +426,11 @@ \section{Other Properties}

\subsection{Status}
\label{sect:Status}
Property representing a status defined by a integer number that can only take on a defined number of values, each with its own description. Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 for False and 1 for True.
Property representing a status defined by a string (numerical values must be down-casted) that can only take on a defined number of values, each with its own description.

\subsubsection{Status.status}
\textbf{vodml-id: Status.status} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
\textbf{multiplicity: 1} \newline
Actual value of the status

Expand All @@ -460,7 +456,7 @@ \section{Other Properties}

\subsubsection{StatusValue.value}
\textbf{vodml-id: StatusValue.value} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:integer}} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
\textbf{multiplicity: 1} \newline
Allowed value for a \texttt{Status}

Expand All @@ -471,8 +467,6 @@ \section{Other Properties}
Free text description of the allowed value for a \texttt{Status}

\subsection{BitField}
\label{sect:BitField}
Property for which each possible value is represented by a bit, so that multiple states can be contained in the same integer value. The possible values are defined in the associated \texttt{StatusValues}, which must correspond to a bit pattern (each value must be a power of 2). This constraint is not enforced by the model.

\subsection{DataLink}
\label{sect:DataLink}
Expand Down Expand Up @@ -504,7 +498,7 @@ \section{Other Properties}

\subsection{Footprint}
\label{sect:Footprint}
Description of the spatial extent of the MANGO object (e.g. for dust clouds). Shape is serialized as a string. \begin{itemize} \item The supported serialization modes are listed in the \texttt{ShapeSerialization} enumeration. \item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference. \end{itemize}
Description of the spatial extent of the MANGO object (e.g. for dust clouds). Footprint is serialized as a string. \begin{itemize} \item The supported serialization modes are listed in the \texttt{ShapeSerialization} enumeration. \item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference. \end{itemize}

\subsubsection{Footprint.serialization}
\textbf{vodml-id: Footprint.serialization} \newline
Expand All @@ -522,21 +516,21 @@ \section{Other Properties}
\textbf{vodml-id: Footprint.spaceSys} \newline
\textbf{type: coords:SpaceSys} \newline
\textbf{multiplicity: 1} \newline
Coordinate system that applies for the shape
Coordinate system that applies for the footprint

\subsection{FootprintSerialization}
\label{sect:FootprintSerialization}
Enumeration of the supported serialization modes for the shapes
Enumeration of the supported serialization modes for the footprints
\noindent \underline{Enumeration Literals}
\vspace{-\parsep}
\small
\begin{itemize}
\item[\textbf{SMOC}]: \textbf{vodml-id:} FootprintSerialization.SMOC \newline
\textbf{description:} Label indicating that the shape has been serialized as a SMOC \citep{2022ivoa.spec.0727F}. SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\textbf{description:} Label indicating that the footprint has been serialized as a SMOC \citep{2022ivoa.spec.0727F}. SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\item[\textbf{STC-S}]: \textbf{vodml-id:} FootprintSerialization.STC-S \newline
\textbf{description:} Label indicating that the shape has been serialized as a STC-S string (see \url{https://www.ivoa.net/documents/STC-S/20130917/index.html}). SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\textbf{description:} Label indicating that the footprint has been serialized as a STC-S string (see \url{https://www.ivoa.net/documents/STC-S/20130917/index.html}). SMOC should be in equatorial ICRS. This overrides the attached space coordinate system (\texttt{spaceSys} reference). When using this serialisation, \texttt{spaceSys} can be ignored.
\item[\textbf{POLYGON}]: \textbf{vodml-id:} FootprintSerialization.POLYGON \newline
\textbf{description:} Label indicating that the shape has been serialized as a polygon as defined in \cite{2017ivoa.spec.0517D} section 3.3.7. Using the polygon serialization requires the space coordinate system to be defined.
\textbf{description:} Label indicating that the footprint has been serialized as a polygon as defined in \cite{2017ivoa.spec.0517D} section 3.3.7. Using the polygon serialization requires the space coordinate system to be defined.
\end{itemize}
\normalsize

Expand Down
4 changes: 2 additions & 2 deletions doc/usecases.tex
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ \subsubsection{Morphologically Complex Structures}

\subsubsection{X-ray Observatory Archives}

The requirements for both Chandra (get more in appendix \ref{sec:chandra})
The requirements for both Chandra
and XMM-Newton \footnote{https://www.cosmos.esa.int/web/xmm-newton} science cases
are combined in this use case.
These 2 X-ray observatories have many common features that could take advantage of sharing the same model:
Expand Down Expand Up @@ -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 table?s
\item what is the meaning of such URL found out in a tables?
\end{itemize}

But there are some other cases like:
Expand Down
28 changes: 0 additions & 28 deletions mivot/mango/mango.BitField.xml

This file was deleted.

4 changes: 2 additions & 2 deletions mivot/mango/mango.Footprint.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<INSTANCE dmrole="" dmtype="mango:Footprint">
<!-- Description of the spatial extent of the MANGO object (e.g. for dust clouds).
Shape is serialized as a string.
Footprint is serialized as a string.
\begin{itemize}
\item The supported serialization modes are listed in the \texttt{ShapeSerialization} enumeration.
\item If the space coordinate system is not embedded in the serialization mode, it can be defined by the \texttt{spaceSys} reference.
Expand All @@ -15,7 +15,7 @@ Shape is serialized as a string.
<INSTANCE dmtype="mango:Property"/>
</COLLECTION>
<ATTRIBUTE dmrole="mango:Footprint.serialization" dmtype="ivoa:string" ref="@@@@@" value=""/>
<!-- Enumeration of the supported serialization modes for the shapes -->
<!-- Enumeration of the supported serialization modes for the footprints -->
<!-- Enumeration datatype: supported values are SMOC STC-S POLYGON -->
<ATTRIBUTE dmrole="mango:Footprint.mode" dmtype="mango:FootprintSerialization" value="OneOf SMOC STC-S POLYGON "/>
<INSTANCE dmrole="mango:Footprint.spaceSys" dmtype="coords:SpaceSys"/>
Expand Down
8 changes: 4 additions & 4 deletions mivot/mango/mango.Status.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<INSTANCE dmrole="" dmtype="mango:Status">
<!-- Property representing a status defined by a integer number
<!-- Property representing a status defined by a string (numerical values must be down-casted)
that can only take on a defined number of values, each with its own description.
Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 for False and 1 for True." -->
" -->
<INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
<!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
<ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
Expand All @@ -11,14 +11,14 @@ Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0
<COLLECTION dmrole="mango:Property.associatedProperties">
<INSTANCE dmtype="mango:Property"/>
</COLLECTION>
<ATTRIBUTE dmrole="mango:Status.status" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:Status.status" dmtype="ivoa:string" ref="@@@@@" value=""/>
<INSTANCE dmrole="mango:Status.allowedValues" dmtype="mango:StatusValues">
<!-- Class holder for the list of the allowed values for the status.
" -->
<COLLECTION dmrole="mango:StatusValues.values">
<INSTANCE dmrole="" dmtype="mango:StatusValue">
<!-- Value allowed for a status; contain the value with a free text description." -->
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
</INSTANCE>
</COLLECTION>
Expand Down
2 changes: 1 addition & 1 deletion mivot/mango/mango.StatusValue.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<INSTANCE dmrole="" dmtype="mango:StatusValue">
<!-- Value allowed for a status; contain the value with a free text description." -->
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
</INSTANCE>
2 changes: 1 addition & 1 deletion mivot/mango/mango.StatusValues.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<COLLECTION dmrole="mango:StatusValues.values">
<INSTANCE dmrole="" dmtype="mango:StatusValue">
<!-- Value allowed for a status; contain the value with a free text description." -->
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:integer" unit="" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:StatusValue.value" dmtype="ivoa:string" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:StatusValue.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
</INSTANCE>
</COLLECTION>
Expand Down
Loading