Skip to content

Commit 04d6e95

Browse files
lmichellmichel
authored
Merge pull request #76 from lmichel/issue73-EP-errors-issue73
Error 2D limited to Symmetrical2D or Ellipse
2 parents 3c5277b + f467f39 commit 04d6e95

File tree

56 files changed

+987
-1210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+987
-1210
lines changed

‎README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@ The MANGO model proposes a flexible way to expose data related to astronomical s
88
- Parameters are modeled by the IVOA MCT DM reusing both native and extended classes. Parameters' roles are given by UCDs and semantic tags.
99
- Associated data can be simple URLs, VO service endpoints or VO data model instances. Their roles are also qualified by semantic tags.
1010

11+
# Document Building
12+
13+
The process of creating the document is a bit complex due to the following facts:
14+
15+
- The model is maintained with Modelio which does not support any version control.
16+
- It is designed in a way to make sure that the diagrams keep in sync with the UML.
17+
- As the text Modelio edition is quite painful, it has been decided to store the description
18+
of all model elements in individual files (`vodml/desc`).
19+
- The VODML (without description) is generated by an XSLT
20+
- The transformation of the VODML into Latex is done by another XSLT
21+
- The items of the generated Latex are ordered following the VODML elements order,
22+
this must be corrected to have a consistent table of content
23+
24+
This process is achieved by scripts located in `utils`. Please read `utils/README.rst`.
25+
26+
If you want to contribute, please have a look at this workflow or ask the editor.
27+
This will prevent your work to be overridden by some script.
28+
1129
# PDF preview
1230

1331
The PDF preview can be seen [here](https://github.com/ivoa-std/MANGO/releases/download/auto-pdf-preview/MANGO-draft.pdf) thanks to the ADQL team who has written a workflow generating it automatically.

‎doc/MANGO.tex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -371,24 +371,24 @@ \section{Integrating MANGO with TAP Services}
371371
% \section{Euclid}
372372
% \input{usecase_euclid.tex}
373373

374-
% \section{Chandra Archive}
375-
% \label{sec:chandra}
376-
% \input{usecase_chandra.tex}
374+
%\section{Chandra Archive}
375+
%\label{sec:chandra}
376+
%\input{usecase_chandra.tex}
377377

378-
% \section{Vizier}
379-
% \input{usecase_vizier.tex}
378+
%\section{Vizier}
379+
%\input{usecase_vizier.tex}
380380

381-
% \section{Morphologically Complex Structures}
382-
% \input{usecase_complex_structures.tex}
381+
%\section{Morphologically Complex Structures}
382+
%\input{usecase_complex_structures.tex}
383383

384-
% \section{Exoplanets}
385-
% \input{usecase_exoplanets.tex}
384+
%\section{Exoplanets}
385+
%\input{usecase_exoplanets.tex}
386386

387-
% \subsubsection{Client Point of View}
388-
% \input{usecase_client_side.tex}
387+
%\subsubsection{Client on (MT behalf)}
388+
%\input{usecase_client_side.tex}
389389

390-
% \section{Xmatch tool }
391-
% \input{usecase_xmatch.tex}
390+
%\section{Xmatch tool }
391+
%\input{usecase_xmatch.tex}
392392

393393
\section{Imported Models Instance}
394394

‎doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DOCNAME = MANGO
77
DOCVERSION = 0.1
88

99
# Publication date, ISO format; update manually for "releases"
10-
DOCDATE = 2025-02-06
10+
DOCDATE = 2025-02-13
1111

1212
# What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
1313
DOCTYPE = WD

‎doc/ivoatexmeta.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% GENERATED FILE -- edit this in the Makefile
22
\newcommand{\ivoaDocversion}{0.1}
3-
\newcommand{\ivoaDocdate}{2025-02-06}
4-
\newcommand{\ivoaDocdatecode}{20250206}
3+
\newcommand{\ivoaDocdate}{2025-02-13}
4+
\newcommand{\ivoaDocdatecode}{20250213}
55
\newcommand{\ivoaDoctype}{WD}
66
\newcommand{\ivoaDocname}{MANGO}
77
\renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO}

‎doc/model.tex

Lines changed: 71 additions & 105 deletions
Large diffs are not rendered by default.

‎doc/model_toc.tex

Lines changed: 81 additions & 115 deletions
Large diffs are not rendered by default.

‎mivot/mango/mango.EpochPosition.xml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
11
<INSTANCE dmrole="" dmtype="mango:EpochPosition">
2-
<!-- This class (fig \ref{fig:EpochPosition}) is a view of \texttt{Astronomical Coordinates and Coordinate
3-
Systems} \citep{2022ivoa.specQ1004R} components that have been put together to form a consistent description
4-
of the position of an object moving over time.
5-
It consists of a celestial position, a proper motion, a radial velocity
6-
and a parallax.
7-
All components share the same coordinate systems for both time and space coordinates.
2+
<!-- This class (fig \ref{fig:EpochPosition}) is a view of \texttt{Astronomical Coordinates and Coordinate Systems}
3+
\citep{2022ivoa.specQ1004R} components that have been combined to form a consistent description of
4+
the position of an object moving in time.
5+
6+
It consists of a celestial position, a proper motion, a radial velocity and a parallax.
7+
8+
All components use the same coordinate systems for both time and space coordinates.
89
910
\begin{itemize}
1011
\item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements.
1112
\item The space coordinate system is imported from \texttt{coords:spaceSys}.
1213
\item The time coordinate system is imported from \texttt{coords:timeSys}.
1314
\end{itemize}
1415
15-
The \texttt{EpochPosition} error is modeled by specific classes supporting covariance
16-
and/or correlation between components.
1716
18-
All individual components have their own units which must be consistent to each others.
17+
All components have their own units which must be consistent with each other.
1918
This consistency is not enforced by the model.
2019
21-
Possible correlations between \texttt{EpochPosition} parameters are handle by the \texttt{EpochPositionCorrelation} class." -->
20+
Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class.
21+
Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class.
22+
23+
In some cases the errors might conflict with the correlations:
24+
25+
\begin{itemize}
26+
\item \texttt{Ellipse} errors on position or proper motion must not be used together with the
27+
\texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields.
28+
In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict
29+
with the correlations defined in \texttt{EpochPositionCorrelations}.
30+
\end{itemize}
31+
" -->
2232
<INSTANCE dmrole="mango:Property.semantics" dmtype="mango:VocabularyTerm">
2333
<!-- Class holder for a term of a standardized vocabulary that applies to a property." -->
2434
<ATTRIBUTE dmrole="mango:VocabularyTerm.uri" dmtype="ivoa:string" ref="@@@@@" value=""/>

‎mivot/mango/mango.MangoObject.xml

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,6 @@ This class specifies both type and role of the property, and hosts the property
3131
</COLLECTION>
3232
</INSTANCE>
3333
</COLLECTION>
34-
<INSTANCE dmrole="mango:MangoObject.dataOrigin" dmtype="mango:dataorigin.DataOrigin">
35-
<!-- Class representing the origin of the data following the DCP note" -->
36-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.citation" dmtype="ivoa:string" ref="@@@@@" value=""/>
37-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.reference_url" dmtype="ivoa:string" ref="@@@@@" value=""/>
38-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.resource_version" dmtype="ivoa:string" ref="@@@@@" value=""/>
39-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.creator" dmtype="ivoa:string" ref="@@@@@" value=""/>
40-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.cites" dmtype="ivoa:string" ref="@@@@@" value=""/>
41-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.is_derived_from" dmtype="ivoa:string" ref="@@@@@" value=""/>
42-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.original_date" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
43-
<INSTANCE dmrole="mango:dataorigin.DataOrigin.query" dmtype="mango:dataorigin.QueryOrigin">
44-
<!-- Description of the query the MANGO instance results from." -->
45-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
46-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.publisher" dmtype="ivoa:string" ref="@@@@@" value=""/>
47-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.server_software" dmtype="ivoa:string" ref="@@@@@" value=""/>
48-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.service_protocol" dmtype="ivoa:string" ref="@@@@@" value=""/>
49-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.request" dmtype="ivoa:string" ref="@@@@@" value=""/>
50-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.query" dmtype="ivoa:string" ref="@@@@@" value=""/>
51-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.request_date" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
52-
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.contact" dmtype="ivoa:string" ref="@@@@@" value=""/>
53-
</INSTANCE>
54-
<INSTANCE dmrole="mango:dataorigin.DataOrigin.rights" dmtype="mango:dataorigin.License">
55-
<!-- Place holder for the license covering the MANGO instance" -->
56-
<ATTRIBUTE dmrole="mango:dataorigin.License.rights_uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
57-
<ATTRIBUTE dmrole="mango:dataorigin.License.rights" dmtype="ivoa:string" ref="@@@@@" value=""/>
58-
</INSTANCE>
59-
<INSTANCE dmrole="mango:dataorigin.DataOrigin.article" dmtype="mango:dataorigin.Article">
60-
<!-- Reference article for the MANGO entity" -->
61-
<ATTRIBUTE dmrole="mango:dataorigin.Article.editor" dmtype="ivoa:string" ref="@@@@@" value=""/>
62-
<ATTRIBUTE dmrole="mango:dataorigin.Article.code" dmtype="ivoa:string" ref="@@@@@" value=""/>
63-
</INSTANCE>
64-
</INSTANCE>
6534
<COLLECTION dmrole="mango:MangoObject.associatedMangoObjects">
6635
<INSTANCE dmrole="mango:MangoObject.associatedMangoObjects" dmtype="mango:AssociatedMangoObject">
6736
<!-- This class gives the role of a link associating 2 \texttt{MangoObject} together." -->
@@ -90,6 +59,40 @@ This class specifies both type and role of the property, and hosts the property
9059
<ATTRIBUTE dmrole="mango:Property.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
9160
</INSTANCE>
9261
</COLLECTION>
62+
<INSTANCE dmrole="mango:MangoObject.queryOrigin" dmtype="mango:dataorigin.QueryOrigin">
63+
<!-- Description of the query the MANGO instance results from." -->
64+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.publisher" dmtype="ivoa:string" ref="@@@@@" value=""/>
65+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.server_software" dmtype="ivoa:string" ref="@@@@@" value=""/>
66+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.service_protocol" dmtype="ivoa:string" ref="@@@@@" value=""/>
67+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.request" dmtype="ivoa:string" ref="@@@@@" value=""/>
68+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.request_date" dmtype="ivoa:string" ref="@@@@@" value=""/>
69+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.query" dmtype="ivoa:string" ref="@@@@@" value=""/>
70+
<ATTRIBUTE dmrole="mango:dataorigin.QueryOrigin.contact" dmtype="ivoa:string" ref="@@@@@" value=""/>
71+
<COLLECTION dmrole="mango:dataorigin.QueryOrigin.dataOrigin">
72+
<INSTANCE dmrole="mango:dataorigin.QueryOrigin.dataOrigin" dmtype="mango:dataorigin.DataOrigin">
73+
<!-- Class representing the origin of the data following the DCP note" -->
74+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
75+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.reference_url" dmtype="ivoa:string" ref="@@@@@" value=""/>
76+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.resource_version" dmtype="ivoa:string" ref="@@@@@" value=""/>
77+
<COLLECTION dmrole="mango:dataorigin.DataOrigin.creators">
78+
</COLLECTION>
79+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.cites" dmtype="ivoa:string" ref="@@@@@" value=""/>
80+
<COLLECTION dmrole="mango:dataorigin.DataOrigin.is_derived_from">
81+
</COLLECTION>
82+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.original_date" dmtype="ivoa:string" ref="@@@@@" value=""/>
83+
<INSTANCE dmrole="mango:dataorigin.DataOrigin.article" dmtype="mango:dataorigin.Article">
84+
<!-- Reference article for the MANGO entity" -->
85+
<ATTRIBUTE dmrole="mango:dataorigin.Article.editor" dmtype="ivoa:string" ref="@@@@@" value=""/>
86+
<ATTRIBUTE dmrole="mango:dataorigin.Article.code" dmtype="ivoa:string" ref="@@@@@" value=""/>
87+
</INSTANCE>
88+
<INSTANCE dmrole="mango:dataorigin.DataOrigin.license" dmtype="mango:dataorigin.License">
89+
<!-- Place holder for the license covering the MANGO instance" -->
90+
<ATTRIBUTE dmrole="mango:dataorigin.License.rights_uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
91+
<ATTRIBUTE dmrole="mango:dataorigin.License.rights" dmtype="ivoa:string" ref="@@@@@" value=""/>
92+
</INSTANCE>
93+
</INSTANCE>
94+
</COLLECTION>
95+
</INSTANCE>
9396
</INSTANCE>
9497
</INSTANCE>
9598
</COLLECTION>

‎mivot/mango/mango.PhysicalProperty.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
<ATTRIBUTE dmrole="mango:VocabularyTerm.label" dmtype="ivoa:string" ref="@@@@@" value=""/>
88
</INSTANCE>
99
<ATTRIBUTE dmrole="mango:Property.description" dmtype="ivoa:string" ref="@@@@@" value=""/>
10+
<ATTRIBUTE dmrole="mango:PhysicalProperty.calibrationLevel" dmtype="ivoa:string" ref="@@@@@" value=""/>
1011
<INSTANCE dmrole="mango:PhysicalProperty.measure" dmtype="meas:Measure"/>
1112
</INSTANCE>

‎mivot/mango/mango.dataorigin.DataOrigin.xml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<INSTANCE dmrole="" dmtype="mango:dataorigin.DataOrigin">
22
<!-- Class representing the origin of the data following the DCP note" -->
3-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.citation" dmtype="ivoa:string" ref="@@@@@" value=""/>
3+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.ivoid" dmtype="ivoa:string" ref="@@@@@" value=""/>
44
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.reference_url" dmtype="ivoa:string" ref="@@@@@" value=""/>
55
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.resource_version" dmtype="ivoa:string" ref="@@@@@" value=""/>
6-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.creator" dmtype="ivoa:string" ref="@@@@@" value=""/>
6+
<COLLECTION dmrole="mango:dataorigin.DataOrigin.creators">
7+
</COLLECTION>
78
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.cites" dmtype="ivoa:string" ref="@@@@@" value=""/>
8-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.is_derived_from" dmtype="ivoa:string" ref="@@@@@" value=""/>
9-
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.original_date" dmtype="ivoa:datetime" unit="" ref="@@@@@" value=""/>
9+
<COLLECTION dmrole="mango:dataorigin.DataOrigin.is_derived_from">
10+
</COLLECTION>
11+
<ATTRIBUTE dmrole="mango:dataorigin.DataOrigin.original_date" dmtype="ivoa:string" ref="@@@@@" value=""/>
1012
</INSTANCE>

0 commit comments

Comments
 (0)