diff --git a/doc/MANGO.tex b/doc/MANGO.tex index e3afd1d..9881b44 100644 --- a/doc/MANGO.tex +++ b/doc/MANGO.tex @@ -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 diff --git a/doc/Makefile b/doc/Makefile index 2c8a8f1..6d4f8a7 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 = 2025-06-02 +DOCDATE = 2025-06-06 # 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 d3729a6..1724f23 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}{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} diff --git a/doc/model.tex b/doc/model.tex index 95bcf3f..75d72cc 100644 --- a/doc/model.tex +++ b/doc/model.tex @@ -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). @@ -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 @@ -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} @@ -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 @@ -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} @@ -518,7 +514,7 @@ \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} @@ -526,11 +522,11 @@ \section{Model: mango } \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 diff --git a/doc/model_toc.tex b/doc/model_toc.tex index d67a72c..2dac666 100644 --- a/doc/model_toc.tex +++ b/doc/model_toc.tex @@ -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} @@ -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 @@ -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} @@ -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} @@ -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 @@ -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 diff --git a/doc/usecases.tex b/doc/usecases.tex index 7ff9964..f600360 100644 --- a/doc/usecases.tex +++ b/doc/usecases.tex @@ -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: @@ -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: diff --git a/mivot/mango/mango.BitField.xml b/mivot/mango/mango.BitField.xml deleted file mode 100644 index 78f5368..0000000 --- a/mivot/mango/mango.BitField.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mivot/mango/mango.Footprint.xml b/mivot/mango/mango.Footprint.xml index 2fb995b..837bdac 100644 --- a/mivot/mango/mango.Footprint.xml +++ b/mivot/mango/mango.Footprint.xml @@ -1,6 +1,6 @@ + diff --git a/mivot/mango/mango.Status.xml b/mivot/mango/mango.Status.xml index 02aa992..d8d6db7 100644 --- a/mivot/mango/mango.Status.xml +++ b/mivot/mango/mango.Status.xml @@ -1,7 +1,7 @@ - +" --> @@ -11,14 +11,14 @@ Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 - + - + diff --git a/mivot/mango/mango.StatusValue.xml b/mivot/mango/mango.StatusValue.xml index d0688b8..a003135 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 f46c662..856d071 100644 --- a/mivot/mango/mango.StatusValues.xml +++ b/mivot/mango/mango.StatusValues.xml @@ -4,7 +4,7 @@ - + diff --git a/model/mango.xmi b/model/mango.xmi index 2caeb2a..c9cebf1 100644 --- a/model/mango.xmi +++ b/model/mango.xmi @@ -1,551 +1,548 @@ - - - - - + + + + + - + 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 - + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + - - + + - - - - + + + + - - + + + + - - - - - - - - + + + - - + + - - - + + + - - - + + + - - + + - - - - + + + + - - - - + + + + - - + + 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/property.png b/model/property.png index ff68e1a..26b5191 100644 Binary files a/model/property.png and b/model/property.png differ diff --git a/utils/__pycache__/processVodml.cpython-311.pyc b/utils/__pycache__/processVodml.cpython-311.pyc index a459711..6bdc816 100644 Binary files a/utils/__pycache__/processVodml.cpython-311.pyc and b/utils/__pycache__/processVodml.cpython-311.pyc differ diff --git a/utils/toc.json b/utils/toc.json index 2ace99d..7930a4b 100644 --- a/utils/toc.json +++ b/utils/toc.json @@ -11,8 +11,7 @@ "EpochPositionErrors": {}, "DateTime": {} }, - "Photometric Properties (added)": { - "PhotometricProperty": {}, + "Photometric and Spectroscopic Properties (added)": { "Brightness": {}, "Color": {}, "ColorDef": {}, diff --git a/utils/toc.org.json b/utils/toc.org.json index 76024c9..d83784e 100644 --- a/utils/toc.org.json +++ b/utils/toc.org.json @@ -1 +1 @@ -{"Model: mango": {"content": "", "subsections": {"AssociatedMangoObject": {"content": ""}, "BitField": {"content": ""}, "Brightness": {"content": ""}, "Color": {"content": ""}, "ColorDef": {"content": ""}, "DataLink": {"content": ""}, "DateTime": {"content": ""}, "EpochPosition": {"content": ""}, "EpochPositionCorrelations": {"content": ""}, "EpochPositionErrors": {"content": ""}, "Footprint": {"content": ""}, "Label": {"content": ""}, "MangoObject": {"content": ""}, "PhysicalProperty": {"content": ""}, "Property": {"content": ""}, "Status": {"content": ""}, "StatusValue": {"content": ""}, "StatusValues": {"content": ""}, "VocabularyTerm": {"content": ""}, "FootprintSerialization": {"content": ""}, "ColorDefinition": {"content": ""}}}, "Package: error": {"content": "", "subsections": {"PErrorAsym1D": {"content": ""}, "PErrorEllipse": {"content": ""}, "PErrorSym1D": {"content": ""}, "PErrorSym2D": {"content": ""}, "PropertyError (Abstract)": {"content": ""}}}, "Package: origin": {"content": "", "subsections": {"Article": {"content": ""}, "DataOrigin": {"content": ""}, "QueryOrigin": {"content": ""}}}} \ No newline at end of file +{"Model: mango": {"content": "", "subsections": {"AssociatedMangoObject": {"content": ""}, "Brightness": {"content": ""}, "Color": {"content": ""}, "ColorDef": {"content": ""}, "DataLink": {"content": ""}, "DateTime": {"content": ""}, "EpochPosition": {"content": ""}, "EpochPositionCorrelations": {"content": ""}, "EpochPositionErrors": {"content": ""}, "Footprint": {"content": ""}, "Label": {"content": ""}, "MangoObject": {"content": ""}, "PhysicalProperty": {"content": ""}, "Property": {"content": ""}, "Status": {"content": ""}, "StatusValue": {"content": ""}, "StatusValues": {"content": ""}, "VocabularyTerm": {"content": ""}, "FootprintSerialization": {"content": ""}, "ColorDefinition": {"content": ""}}}, "Package: error": {"content": "", "subsections": {"PErrorAsym1D": {"content": ""}, "PErrorEllipse": {"content": ""}, "PErrorSym1D": {"content": ""}, "PErrorSym2D": {"content": ""}, "PropertyError (Abstract)": {"content": ""}}}, "Package: origin": {"content": "", "subsections": {"Article": {"content": ""}, "DataOrigin": {"content": ""}, "QueryOrigin": {"content": ""}}}} \ No newline at end of file diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml index 44270e7..63f7e96 100644 --- a/vo-dml/desc.mango.vo-dml.xml +++ b/vo-dml/desc.mango.vo-dml.xml @@ -7,7 +7,7 @@ Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado 1.0 0.0 - 2025-05-19T16:09:29 + 2025-06-06T13:58:18 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -31,25 +31,25 @@ FootprintSerialization FootprintSerialization - Enumeration of the supported serialization modes for the shapes + Enumeration of the supported serialization modes for the footprints FootprintSerialization.SMOC SMOC - Label indicating that the shape has been serialized as a SMOC \citep{2022ivoa.spec.0727F}. + 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. FootprintSerialization.STC-S STC-S - 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}). + 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. FootprintSerialization.POLYGON POLYGON - Label indicating that the shape has been serialized as a polygon as defined in \cite{2017ivoa.spec.0517D} section 3.3.7. + 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. @@ -388,9 +388,9 @@ and/or quality factors. Status 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. + mango:Property @@ -399,7 +399,7 @@ Boolean status can be represented by \texttt{StatusValues} with 2 values e.g. 0 status Actual value of the status - ivoa:integer + ivoa:string 1 @@ -450,7 +450,7 @@ of the \texttt{MangoObject} (e.g., Cataclysmic Variable) with the appropriate vo Footprint 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. @@ -486,7 +486,7 @@ Shape is serialized as a string. Footprint.spaceSys spaceSys - Coordinate system that applies for the shape + Coordinate system that applies for the footprint coords:SpaceSys @@ -632,19 +632,6 @@ with a square transfert function. - - BitField - 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. - - mango:Status - - - StatusValues StatusValues @@ -673,7 +660,7 @@ This constraint is not enforced by the model. value Allowed value for a \texttt{Status} - ivoa:integer + ivoa:string 1 diff --git a/vo-dml/desc/desc.Footprint.spaceSys.txt b/vo-dml/desc/desc.Footprint.spaceSys.txt index afa927e..ec46c79 100644 --- a/vo-dml/desc/desc.Footprint.spaceSys.txt +++ b/vo-dml/desc/desc.Footprint.spaceSys.txt @@ -1 +1 @@ -Coordinate system that applies for the shape \ No newline at end of file +Coordinate system that applies for the footprint \ No newline at end of file diff --git a/vo-dml/desc/desc.Footprint.txt b/vo-dml/desc/desc.Footprint.txt index 97f1ce7..fe3f601 100644 --- a/vo-dml/desc/desc.Footprint.txt +++ b/vo-dml/desc/desc.Footprint.txt @@ -1,5 +1,5 @@ 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. diff --git a/vo-dml/desc/desc.FootprintSerialization.POLYGON.txt b/vo-dml/desc/desc.FootprintSerialization.POLYGON.txt index e331d45..99c43ff 100644 --- a/vo-dml/desc/desc.FootprintSerialization.POLYGON.txt +++ b/vo-dml/desc/desc.FootprintSerialization.POLYGON.txt @@ -1,2 +1,2 @@ -Label indicating that the shape has been serialized as a polygon as defined in \cite{2017ivoa.spec.0517D} section 3.3.7. +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. \ No newline at end of file diff --git a/vo-dml/desc/desc.FootprintSerialization.SMOC.txt b/vo-dml/desc/desc.FootprintSerialization.SMOC.txt index a896c1d..37bac58 100644 --- a/vo-dml/desc/desc.FootprintSerialization.SMOC.txt +++ b/vo-dml/desc/desc.FootprintSerialization.SMOC.txt @@ -1,3 +1,3 @@ -Label indicating that the shape has been serialized as a SMOC \citep{2022ivoa.spec.0727F}. +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. \ No newline at end of file diff --git a/vo-dml/desc/desc.FootprintSerialization.STC-S.txt b/vo-dml/desc/desc.FootprintSerialization.STC-S.txt index 7370e8c..2cec987 100644 --- a/vo-dml/desc/desc.FootprintSerialization.STC-S.txt +++ b/vo-dml/desc/desc.FootprintSerialization.STC-S.txt @@ -1,3 +1,3 @@ -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}). +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. \ No newline at end of file diff --git a/vo-dml/desc/desc.FootprintSerialization.txt b/vo-dml/desc/desc.FootprintSerialization.txt index bed367a..908ebc2 100644 --- a/vo-dml/desc/desc.FootprintSerialization.txt +++ b/vo-dml/desc/desc.FootprintSerialization.txt @@ -1 +1 @@ -Enumeration of the supported serialization modes for the shapes \ No newline at end of file +Enumeration of the supported serialization modes for the footprints \ No newline at end of file diff --git a/vo-dml/desc/desc.Status.txt b/vo-dml/desc/desc.Status.txt index 9373520..f98f77b 100644 --- a/vo-dml/desc/desc.Status.txt +++ b/vo-dml/desc/desc.Status.txt @@ -1,3 +1,2 @@ -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. \ No newline at end of file diff --git a/vo-dml/mango.png b/vo-dml/mango.png index 1c92c1c..00050e1 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 1a3f38f..3821f6e 100644 --- a/vo-dml/mango.vo-dml.xml +++ b/vo-dml/mango.vo-dml.xml @@ -10,7 +10,7 @@ Laurent Michel, Fran??ois Bonnarel, Gilles Landais, Mireille Louys, Marco Molinaro, Jesue Salgado 1.0 0.0 - 2025-05-19T16:09:29 + 2025-06-06T13:58:18 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -381,7 +381,7 @@ As long as the vocabulary is not set, the possible values of this attribute are TODO : Missing description : please, update your UML model asap. - ivoa:integer + ivoa:string 1 @@ -624,17 +624,6 @@ As long as the vocabulary is not set, the possible values of this attribute are - - BitField - BitField - - TODO : Missing description : please, update your UML model asap. - - - mango:Status - - - StatusValues StatusValues @@ -670,7 +659,7 @@ As long as the vocabulary is not set, the possible values of this attribute are TODO : Missing description : please, update your UML model asap. - ivoa:integer + ivoa:string 1 diff --git a/vo-dml/desc/desc.BitField.txt b/vo-dml/trash/desc.BitField.txt similarity index 100% rename from vo-dml/desc/desc.BitField.txt rename to vo-dml/trash/desc.BitField.txt