diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
index 98ab575..29bc580 100644
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -16,9 +16,7 @@ env:
on:
push:
branches:
- - master
- - wd-v1.0
- - dal-review
+ - brigita_review
- pr-1.0
jobs:
diff --git a/doc/.github/workflows/preview.yml b/doc/.github/workflows/preview.yml
index a976689..3b87242 100644
--- a/doc/.github/workflows/preview.yml
+++ b/doc/.github/workflows/preview.yml
@@ -16,7 +16,8 @@ env:
on:
push:
branches:
- - master
+ - pr-1.0
+ - brigita_review
jobs:
build:
diff --git a/doc/MANGO.tex b/doc/MANGO.tex
index d54e2f4..d70b308 100644
--- a/doc/MANGO.tex
+++ b/doc/MANGO.tex
@@ -292,9 +292,9 @@ \subsection{Properties}
\hline
\texttt{EpochPosition} & Grouping of position with velocity and time & Parameters to solve the epoch propagation case\\
\hline
- \texttt{Brightness} & Flux or Magnitude & many \\
+ \texttt{Brightness} & Flux or Magnitude & Object magnitude along with photometric calibration. \\
\hline
- \texttt{Color} & Hardness ratio or magnitude ratio & many \\ [1ex]
+ \texttt{Color} & Hardness ratio or magnitude ratio & XMM-Newton hardness ratio, along with descriptions of the related energy bands. \\ [1ex]
\hline
\texttt{DataLink} & Flat representation of DataLink responses & Links to associated data given as column values\\ [1ex]
\hline
@@ -303,10 +303,10 @@ \subsection{Properties}
\label{table:properties}
\end{center}
\end{table}
-This initial release supports a limited list of property types, listed in table \ref{table:properties}, that address the most common use cases.
-
-All of these components are described in alphabetical order in the next section.
+This initial release supports a limited list of property types, listed in table \ref{table:properties},
+that address the most common use cases.
+These components are all described individually in the following sections.
\subsubsection{Property Identification}
Since the set of properties associated with a particular instance is not defined by the model,
diff --git a/doc/Makefile b/doc/Makefile
index f6b3115..361cea2 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -7,7 +7,7 @@ DOCNAME = MANGO
DOCVERSION = 1.0
# Publication date, ISO format; update manually for "releases"
-DOCDATE = 2026-01-22
+DOCDATE = 2026-01-28
# 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 3151793..edb1ee3 100644
--- a/doc/ivoatexmeta.tex
+++ b/doc/ivoatexmeta.tex
@@ -1,7 +1,7 @@
% GENERATED FILE -- edit this in the Makefile
\newcommand{\ivoaDocversion}{1.0}
-\newcommand{\ivoaDocdate}{2026-01-22}
-\newcommand{\ivoaDocdatecode}{20260122}
+\newcommand{\ivoaDocdate}{2026-01-28}
+\newcommand{\ivoaDocdatecode}{20260128}
\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 ef3f929..6d2e8f4 100644
--- a/doc/model.tex
+++ b/doc/model.tex
@@ -243,13 +243,13 @@ \section{Model: mango }
\subsubsection{EpochPosition.spaceSys}
\textbf{vodml-id: EpochPosition.spaceSys} \newline
\textbf{type: coords:SpaceSys} \newline
- \textbf{multiplicity: 0..1} \newline
+ \textbf{multiplicity: 1} \newline
System that applies the space coordinates.
\subsubsection{EpochPosition.timeSys}
\textbf{vodml-id: EpochPosition.timeSys} \newline
\textbf{type: coords:TimeSys} \newline
- \textbf{multiplicity: 0..1} \newline
+ \textbf{multiplicity: 1} \newline
System that applies the time coordinates (the epoch).
\subsection{EpochPositionCorrelations}
@@ -398,11 +398,11 @@ \section{Model: mango }
\textbf{multiplicity: 0..*} \newline
Contains the open-ended collection of the \texttt{MangoObject} properties (physical, calculated or assigned).
- \subsubsection{MangoObject.associatedMangoObjects}
- \textbf{vodml-id: MangoObject.associatedMangoObjects} \newline
+ \subsubsection{MangoObject.mangoObjects}
+ \textbf{vodml-id: MangoObject.mangoObjects} \newline
\textbf{type: \hyperref[sect:AssociatedMangoObject]{mango:AssociatedMangoObject}} \newline
\textbf{multiplicity: 0..*} \newline
- Abstract reference to a particular dataset associated to the MANGO entity. This class is used to specify the type of the associated dataset as well as its role.
+ Reference to 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
diff --git a/doc/model_toc.tex b/doc/model_toc.tex
index ca0c80a..3b33192 100644
--- a/doc/model_toc.tex
+++ b/doc/model_toc.tex
@@ -19,11 +19,11 @@ \section{Model: mango}
\textbf{multiplicity: 0..*} \newline
Contains the open-ended collection of the \texttt{MangoObject} properties (physical, calculated or assigned).
- \subsubsection{MangoObject.associatedMangoObjects}
- \textbf{vodml-id: MangoObject.associatedMangoObjects} \newline
+ \subsubsection{MangoObject.mangoObjects}
+ \textbf{vodml-id: MangoObject.mangoObjects} \newline
\textbf{type: \hyperref[sect:AssociatedMangoObject]{mango:AssociatedMangoObject}} \newline
\textbf{multiplicity: 0..*} \newline
- Abstract reference to a particular dataset associated to the MANGO entity. This class is used to specify the type of the associated dataset as well as its role.
+ Reference to 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
@@ -190,13 +190,13 @@ \section{Epoch Position Properties}
\subsubsection{EpochPosition.spaceSys}
\textbf{vodml-id: EpochPosition.spaceSys} \newline
\textbf{type: coords:SpaceSys} \newline
- \textbf{multiplicity: 0..1} \newline
+ \textbf{multiplicity: 1} \newline
System that applies the space coordinates.
\subsubsection{EpochPosition.timeSys}
\textbf{vodml-id: EpochPosition.timeSys} \newline
\textbf{type: coords:TimeSys} \newline
- \textbf{multiplicity: 0..1} \newline
+ \textbf{multiplicity: 1} \newline
System that applies the time coordinates (the epoch).
\subsection{EpochPositionCorrelations}
diff --git a/doc/role_diagram.pdf b/doc/role_diagram.pdf
index cd14d5f..0469e11 100644
Binary files a/doc/role_diagram.pdf and b/doc/role_diagram.pdf differ
diff --git a/mivot/mango/mango.AssociatedMangoObject.xml b/mivot/mango/mango.AssociatedMangoObject.xml
index b4b93bb..6d6d292 100644
--- a/mivot/mango/mango.AssociatedMangoObject.xml
+++ b/mivot/mango/mango.AssociatedMangoObject.xml
@@ -29,7 +29,7 @@ This class specifies both type and role of the property, and hosts the property
-
+
diff --git a/mivot/mango/mango.MangoObject.xml b/mivot/mango/mango.MangoObject.xml
index 327a484..d45d641 100644
--- a/mivot/mango/mango.MangoObject.xml
+++ b/mivot/mango/mango.MangoObject.xml
@@ -36,8 +36,8 @@ This class specifies both type and role of the property, and hosts the property
-
-
+
+
@@ -68,7 +68,7 @@ This class specifies both type and role of the property, and hosts the property
-
+
diff --git a/model/EpochPosition.png b/model/EpochPosition.png
index a7129f4..567c458 100644
Binary files a/model/EpochPosition.png and b/model/EpochPosition.png differ
diff --git a/model/mango.xmi b/model/mango.xmi
index 8fd6d47..f92784c 100644
--- a/model/mango.xmi
+++ b/model/mango.xmi
@@ -1,550 +1,546 @@
-
-
-
-
-
+
+
+
+
+
-
+
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/overview.png b/model/overview.png
index 11d5491..ac8006b 100644
Binary files a/model/overview.png and b/model/overview.png differ
diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml
index 8df972c..07bd6f3 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
- 2025-12-11T13:52:24
+ 2026-01-28T13:16:49
ivoa
http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml
@@ -226,10 +226,11 @@ The format is free.
- MangoObject.associatedMangoObjects
- associatedMangoObjects
- Abstract reference to a particular dataset associated to the MANGO entity.
-This class is used to specify the type of the associated dataset as well as its role.
+ MangoObject.mangoObjects
+ mangoObjects
+ Reference to particular datasets (\texttt{mango:MangoObject} instances) that are associated with
+the MANGO object via \texttt{mango:AssociatedMangoObject} instances.
+
mango:AssociatedMangoObject
@@ -935,7 +936,7 @@ providers to convey whether or not the factor has been applied (see \texttt{meas
coords:SpaceSys
- 0
+ 1
1
@@ -947,7 +948,7 @@ providers to convey whether or not the factor has been applied (see \texttt{meas
coords:TimeSys
- 0
+ 1
1
diff --git a/vo-dml/desc/desc.MangoObject.associatedMangoObjects.txt b/vo-dml/desc/desc.MangoObject.associatedMangoObjects.txt
deleted file mode 100644
index fb02371..0000000
--- a/vo-dml/desc/desc.MangoObject.associatedMangoObjects.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Abstract reference to a particular dataset associated to the MANGO entity.
-This class is used to specify the type of the associated dataset as well as its role.
\ No newline at end of file
diff --git a/vo-dml/desc/desc.MangoObject.mangoObjects.txt b/vo-dml/desc/desc.MangoObject.mangoObjects.txt
new file mode 100644
index 0000000..97bca07
--- /dev/null
+++ b/vo-dml/desc/desc.MangoObject.mangoObjects.txt
@@ -0,0 +1,2 @@
+Reference to particular datasets (\texttt{mango:MangoObject} instances) that are associated with
+the MANGO object via \texttt{mango:AssociatedMangoObject} instances.
diff --git a/vo-dml/mango.png b/vo-dml/mango.png
index 3662d0a..0665cf1 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 77caf3f..89fed73 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
- 2025-12-11T13:52:24
+ 2026-01-28T13:16:49
ivoa
http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml
@@ -228,8 +228,8 @@ The format is free.
- MangoObject.associatedMangoObjects
- associatedMangoObjects
+ MangoObject.mangoObjects
+ mangoObjects
TODO : Missing description : please, update your UML model asap.
@@ -881,7 +881,7 @@ As long as the vocabulary is not set, the possible values of this attribute are
coords:SpaceSys
- 0
+ 1
1
@@ -895,7 +895,7 @@ As long as the vocabulary is not set, the possible values of this attribute are
coords:TimeSys
- 0
+ 1
1