Merge pull request #77 from lmichel/issue73-EP-errors-issue73

#63 ti 73

Author: lmichel

doc/Makefile

@@ -7,7 +7,7 @@ DOCNAME = MANGO
 DOCVERSION = 0.1
 
 # Publication date, ISO format; update manually for "releases"
-DOCDATE = 2025-02-13
+DOCDATE = 2025-02-18
 
 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN
 DOCTYPE = WD

doc/ivoatexmeta.tex

@@ -1,7 +1,7 @@
 % GENERATED FILE -- edit this in the Makefile
 \newcommand{\ivoaDocversion}{0.1}
-\newcommand{\ivoaDocdate}{2025-02-13}
-\newcommand{\ivoaDocdatecode}{20250213}
+\newcommand{\ivoaDocdate}{2025-02-18}
+\newcommand{\ivoaDocdatecode}{20250218}
 \newcommand{\ivoaDoctype}{WD}
 \newcommand{\ivoaDocname}{MANGO}
 \renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO}

doc/model.tex

@@ -142,7 +142,7 @@ \section{Model: mango }
 
 
   \label{sect:EpochPosition}
-    This class (fig \ref{fig:EpochPosition}) is a view of \texttt{Astronomical Coordinates and Coordinate Systems} \citep{2022ivoa.specQ1004R} components that have been combined to form a consistent description of the position of an object moving in time. It consists of a celestial position, a proper motion, a radial velocity and a parallax. All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:spaceSys}. \item The time coordinate system is imported from \texttt{coords:timeSys}. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize}
+    This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the Astronomical Measurements Model \citep{2022ivoa.specQ1004R} that have been put together to form a consistent description of the position of an object moving over time. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems model \citep{2022ivoa.spec.1004R} At a high level the properties map as follows: \begin{itemize} \item celestial position -> \texttt{meas:Position} \item proper motion -> \texttt{meas:ProperMotion} \item radial velocity -> \texttt{meas.Velocity} \item parallax -> no suitable counterpart at this time \end{itemize} All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:spaceSys}. \item The time coordinate system is imported from \texttt{coords:timeSys}. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize}
 
     \subsubsection{EpochPosition.longitude}
       \textbf{vodml-id: EpochPosition.longitude} \newline
@@ -376,7 +376,7 @@ \section{Model: mango }
       \textbf{vodml-id: PhysicalProperty.calibrationLevel} \newline
       \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
       \textbf{multiplicity: 1} \newline
-      Calibration level of the property as defined in \url{https://www.ivoa.net/rdf/processing-level/2024-11-12/processing-level.html}
+      Calibration level of the property as defined in \url{http://www.ivoa.net/rdf/processing-level}
 
     \subsubsection{PhysicalProperty.measure}
       \textbf{vodml-id: PhysicalProperty.measure} \newline

doc/model_toc.tex

@@ -104,7 +104,7 @@ \section{Epoch Position Properties}
     \label{fig:EpochPosition}
     \end{figure}
     \label{sect:EpochPosition}
-    This class (fig \ref{fig:EpochPosition}) is a view of \texttt{Astronomical Coordinates and Coordinate Systems} \citep{2022ivoa.specQ1004R} components that have been combined to form a consistent description of the position of an object moving in time. It consists of a celestial position, a proper motion, a radial velocity and a parallax. All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:spaceSys}. \item The time coordinate system is imported from \texttt{coords:timeSys}. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize}
+    This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the Astronomical Measurements Model \citep{2022ivoa.specQ1004R} that have been put together to form a consistent description of the position of an object moving over time. It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated errors encapsulated into the \texttt{EpochPositionErrors} class. The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems model \citep{2022ivoa.spec.1004R} At a high level the properties map as follows: \begin{itemize} \item celestial position -> \texttt{meas:Position} \item proper motion -> \texttt{meas:ProperMotion} \item radial velocity -> \texttt{meas.Velocity} \item parallax -> no suitable counterpart at this time \end{itemize} All components use the same coordinate systems for both time and space coordinates. \begin{itemize} \item Both position and proper motion reuse \texttt{coords:LonLatPoint} elements. \item The space coordinate system is imported from \texttt{coords:spaceSys}. \item The time coordinate system is imported from \texttt{coords:timeSys}. \end{itemize} All components have their own units which must be consistent with each other. This consistency is not enforced by the model. Possible correlations between \texttt{EpochPosition} parameters are handled by the \texttt{EpochPositionCorrelations} class. Errors along the different axes are grouped in the \texttt{EpochPositionErrors} class. In some cases the errors might conflict with the correlations: \begin{itemize} \item \texttt{Ellipse} errors on position or proper motion must not be used together with the \texttt{longitudeLatitude} (or \texttt{pmLongitudePmLatitude}) correlation fields. In fact, using elliptical errors implies a correlation between the two spatial axes which must not conflict with the correlations defined in \texttt{EpochPositionCorrelations}. \end{itemize}
 
     \subsubsection{EpochPosition.longitude}
     \textbf{vodml-id: EpochPosition.longitude} \newline
@@ -363,16 +363,14 @@ \section{Physical Properties}
     \textbf{vodml-id: PhysicalProperty.calibrationLevel} \newline
     \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
     \textbf{multiplicity: 1} \newline
-    Calibration level of the property as defined in \url{https://www.ivoa.net/rdf/processing-level/2024-11-12/processing-level.html}
+    Calibration level of the property as defined in \url{http://www.ivoa.net/rdf/processing-level}
 
     \subsubsection{PhysicalProperty.measure}
     \textbf{vodml-id: PhysicalProperty.measure} \newline
     \textbf{type: meas:Measure} \newline
     \textbf{multiplicity: 1} \newline
     Instance of \texttt{Astronomical Measurements Model} that holds the Property value(s).
 
-  \subsection{CalibrationLevel}
-
 \section{Other Properties}
 
   \subsection{Label}

utils/toc.json

@@ -18,8 +18,7 @@
         "ColorDefinition": {}
     },
     "Physical Properties (added)": {
-        "PhysicalProperty": {},
-        "CalibrationLevel": {}
+        "PhysicalProperty": {}
     },
     "Other Properties (added)": {
         "Label": {},

vo-dml/desc.mango.vo-dml.xml

@@ -488,7 +488,7 @@ as defined by the \texttt{PhotDM} model.</description>
       <vodml-id>PhysicalProperty.calibrationLevel</vodml-id>
       <name>calibrationLevel</name>
       <description>Calibration level of the property as defined 
-in \url{https://www.ivoa.net/rdf/processing-level/2024-11-12/processing-level.html}</description>
+in \url{http://www.ivoa.net/rdf/processing-level}</description>
       <datatype>
         <vodml-ref>ivoa:string</vodml-ref>
       </datatype>
@@ -650,11 +650,22 @@ This constraint is not enforced by the model.</description>
   <objectType>
     <vodml-id>EpochPosition</vodml-id>
     <name>EpochPosition</name>
-    <description>This class (fig \ref{fig:EpochPosition}) is a view of \texttt{Astronomical Coordinates and Coordinate Systems}
- \citep{2022ivoa.specQ1004R} components that have been combined to form a consistent description of 
-the position of an object moving in time. 
+    <description> This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the 
+ Astronomical Measurements Model  \citep{2022ivoa.specQ1004R} that have been put together 
+ to form a consistent description of the position of an object moving over time. 
+ It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated 
+ errors encapsulated into the \texttt{EpochPositionErrors} class. 
+ The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems 
+ model \citep{2022ivoa.spec.1004R}
+ 
+At a high level the properties map as follows:
+\begin{itemize}
+    \item celestial position -&gt; \texttt{meas:Position}
+    \item  proper motion -&gt; \texttt{meas:ProperMotion}
+    \item  radial velocity -&gt; \texttt{meas.Velocity}
+    \item  parallax -&gt; no suitable counterpart at this time
+\end{itemize}
 
-It consists of a celestial position, a proper motion, a radial velocity and a parallax. 
 
 All components use the same coordinate systems for both time and space coordinates.
 

vo-dml/desc/desc.EpochPosition.txt

@@ -1,8 +1,19 @@
-This class (fig \ref{fig:EpochPosition}) is a view of \texttt{Astronomical Coordinates and Coordinate Systems}
- \citep{2022ivoa.specQ1004R} components that have been combined to form a consistent description of 
-the position of an object moving in time. 
+ This class (fig \ref{fig:EpochPosition}) is a flattened view of objects/concepts from the 
+ Astronomical Measurements Model  \citep{2022ivoa.specQ1004R} that have been put together 
+ to form a consistent description of the position of an object moving over time. 
+ It consists of a celestial position, a proper motion, a radial velocity and a parallax and their associated 
+ errors encapsulated into the \texttt{EpochPositionErrors} class. 
+ The values of these properties are pulled from the underlying Astronomical Coordinates and Coordinate Systems 
+ model \citep{2022ivoa.spec.1004R}
+ 
+At a high level the properties map as follows:
+\begin{itemize}
+    \item celestial position -> \texttt{meas:Position}
+    \item  proper motion -> \texttt{meas:ProperMotion}
+    \item  radial velocity -> \texttt{meas.Velocity}
+    \item  parallax -> no suitable counterpart at this time
+\end{itemize}
 
-It consists of a celestial position, a proper motion, a radial velocity and a parallax. 
 
 All components use the same coordinate systems for both time and space coordinates.
 

vo-dml/desc/desc.PhysicalProperty.calibrationLevel.txt

@@ -1,2 +1,2 @@
 Calibration level of the property as defined 
-in \url{https://www.ivoa.net/rdf/processing-level/2024-11-12/processing-level.html}
+in \url{http://www.ivoa.net/rdf/processing-level}