diff --git a/doc/Makefile b/doc/Makefile index 5804ca3..2be9853 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 = 2024-10-20 +DOCDATE = 2024-12-05 # What is it you're writing: NOTE, WD, PR, REC, PEN, or EN DOCTYPE = WD diff --git a/doc/ivoatexmeta.tex b/doc/ivoatexmeta.tex index 41deb02..6c94012 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}{2024-10-20} -\newcommand{\ivoaDocdatecode}{20241020} +\newcommand{\ivoaDocdate}{2024-12-05} +\newcommand{\ivoaDocdatecode}{20241205} \newcommand{\ivoaDoctype}{WD} \newcommand{\ivoaDocname}{MANGO} \renewcommand{\ivoaBaseURL}{https://www.ivoa.net/documents/MANGO} diff --git a/doc/model.tex b/doc/model.tex index 1aa4357..2b81365 100644 --- a/doc/model.tex +++ b/doc/model.tex @@ -62,6 +62,16 @@ \section{Model: mango } \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 distinction between fluxes and magnitudes is made by the unit. This property should refer to a photometric calibration as defined by the \texttt{Phot} data model (1.1). + + \subsubsection{Brightness.photCal} + \textbf{vodml-id: Brightness.photCal} \newline + \textbf{type: Phot:PhotCal} \newline + \textbf{multiplicity: 1} \newline + Photometric calibration that applies to the photometric property. It must be an instance of \texttt{photdm:PhotCal}. + \subsection{Color} \label{sect:Color} Property that describes a color of the \texttt{MangoObject}. The color is not an intrinsic property of the MANGO object, but a value relative to two filters or energy bands. @@ -282,26 +292,26 @@ \section{Model: mango } \subsubsection{EpochPositionErrors.parallax} \textbf{vodml-id: EpochPositionErrors.parallax} \newline - \textbf{type: \hyperref[sect:error.Symmetric1D]{mango:error.Symmetric1D}} \newline - \textbf{multiplicity: 0..1} \newline + \textbf{type: \hyperref[sect:error.PropertyError]{mango:error.PropertyError}} \newline + \textbf{multiplicity: 1} \newline Parallax error. This error is meant to be symmetrical in the current model version. \subsubsection{EpochPositionErrors.radialVelocity} \textbf{vodml-id: EpochPositionErrors.radialVelocity} \newline - \textbf{type: \hyperref[sect:error.Symmetric1D]{mango:error.Symmetric1D}} \newline - \textbf{multiplicity: 0..1} \newline + \textbf{type: \hyperref[sect:error.PropertyError]{mango:error.PropertyError}} \newline + \textbf{multiplicity: 1} \newline Error in the radial velocity. This error is meant to be symmetrical in the current model version. - \subsubsection{EpochPositionErrors.position} - \textbf{vodml-id: EpochPositionErrors.position} \newline - \textbf{type: \hyperref[sect:error.PropertyError2D]{mango:error.PropertyError2D}} \newline - \textbf{multiplicity: 0..1} \newline - Position error; can be an ellipse, a correlation matrix or a covariance matrix. - \subsubsection{EpochPositionErrors.properMotion} \textbf{vodml-id: EpochPositionErrors.properMotion} \newline - \textbf{type: \hyperref[sect:error.PropertyError2D]{mango:error.PropertyError2D}} \newline - \textbf{multiplicity: 0..1} \newline + \textbf{type: \hyperref[sect:error.PropertyError]{mango:error.PropertyError}} \newline + \textbf{multiplicity: 1} \newline + Position error; can be an ellipse, a correlation matrix or a covariance matrix. + + \subsubsection{EpochPositionErrors.Position} + \textbf{vodml-id: EpochPositionErrors.Position} \newline + \textbf{type: \hyperref[sect:error.PropertyError]{mango:error.PropertyError}} \newline + \textbf{multiplicity: 1} \newline Position error; can be an ellipse, a correlation matrix or a covariance matrix. \subsection{Label} @@ -344,7 +354,7 @@ \section{Model: mango } \subsection{PhotometricProperty} \label{sect:PhotometricProperty} - Observed brightness of the \texttt{MangoObject}. The distinction between fluxes and magnitudes is made by the unit. This property should refer to a photometric calibration as defined by the \texttt{Phot} data model (1.1). + Super class for all photometric properties of the \texttt{MangoObject}. \subsubsection{PhotometricProperty.value} \textbf{vodml-id: PhotometricProperty.value} \newline @@ -355,14 +365,8 @@ \section{Model: mango } \subsubsection{PhotometricProperty.error} \textbf{vodml-id: PhotometricProperty.error} \newline \textbf{type: meas:Uncertainty} \newline - \textbf{multiplicity: 0..1} \newline - Error on the \texttt{PhotometricProperty}, imported from \texttt{meas:Uncertainty}. - - \subsubsection{PhotometricProperty.photCal} - \textbf{vodml-id: PhotometricProperty.photCal} \newline - \textbf{type: Phot:PhotCal} \newline \textbf{multiplicity: 1} \newline - Photometric calibration that applies to the photometric property. It must be an instance of \texttt{photdm:PhotCal}. + Error on the \texttt{PhotometricProperty}, imported from \texttt{meas:Uncertainty}. \subsection{PhysicalProperty} \label{sect:PhysicalProperty} @@ -601,7 +605,7 @@ \section{Package: error } \subsection{Ellipse} \label{sect:error.Ellipse} - Elliptic error for 2D parameters such as sky positions. Major axis and minor axis have their own units, which must be the same for both. This is not enforced by the model. + Elliptic error for 2D parameters such as sky positions. Major axis and minor axis have their own units, which must be the same for both. This is not enforced by the model. The definition of the ellipse attribute is imported from \texttt{coords:Ellipse}. \subsubsection{Ellipse.semiMajorAxis} \textbf{vodml-id: error.Ellipse.semiMajorAxis} \newline @@ -675,9 +679,11 @@ \section{Package: error } \textbf{multiplicity: 1} \newline Confidence level of the error. The confidence level must be in $[0, 1]$ (not enforced by the VO-DML schema). - \subsection{PropertyError2D (Abstract)} - \label{sect:error.PropertyError2D} - Super (abstract) class for all errors of 2D parameters + \subsubsection{PropertyError.distribution} + \textbf{vodml-id: error.PropertyError.distribution} \newline + \textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline + \textbf{multiplicity: 1} \newline + TODO : Missing description : please, update your UML model asap. \subsection{Symmetric1D} \label{sect:error.Symmetric1D} diff --git a/mivot/mango/mango.Brightness.xml b/mivot/mango/mango.Brightness.xml new file mode 100644 index 0000000..4317bc5 --- /dev/null +++ b/mivot/mango/mango.Brightness.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/mivot/mango/mango.EpochPosition.xml b/mivot/mango/mango.EpochPosition.xml index b66614f..0e4b34c 100644 --- a/mivot/mango/mango.EpochPosition.xml +++ b/mivot/mango/mango.EpochPosition.xml @@ -35,22 +35,14 @@ Possible correlations between \texttt{EpochPosition} parameters are handle by th - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/mivot/mango/mango.EpochPositionErrors.xml b/mivot/mango/mango.EpochPositionErrors.xml index 4f4e6dd..440dfa3 100644 --- a/mivot/mango/mango.EpochPositionErrors.xml +++ b/mivot/mango/mango.EpochPositionErrors.xml @@ -1,19 +1,11 @@ - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/mivot/mango/mango.PhotometricProperty.xml b/mivot/mango/mango.PhotometricProperty.xml index 181af78..ab610e2 100644 --- a/mivot/mango/mango.PhotometricProperty.xml +++ b/mivot/mango/mango.PhotometricProperty.xml @@ -1,7 +1,6 @@ - + @@ -10,5 +9,4 @@ This property should refer to a photometric calibration as defined by the \textt - diff --git a/mivot/mango/mango.error.Asymmetric1D.xml b/mivot/mango/mango.error.Asymmetric1D.xml index c1fb757..313d4ab 100644 --- a/mivot/mango/mango.error.Asymmetric1D.xml +++ b/mivot/mango/mango.error.Asymmetric1D.xml @@ -2,6 +2,7 @@ + diff --git a/mivot/mango/mango.error.Ellipse.xml b/mivot/mango/mango.error.Ellipse.xml index de51379..84190fc 100644 --- a/mivot/mango/mango.error.Ellipse.xml +++ b/mivot/mango/mango.error.Ellipse.xml @@ -1,9 +1,10 @@ +This is not enforced by the model. The definition of the ellipse attribute is imported from \texttt{coords:Ellipse}. " --> + diff --git a/mivot/mango/mango.error.ErrorCorrMatrix.xml b/mivot/mango/mango.error.ErrorCorrMatrix.xml index 9365792..347ef08 100644 --- a/mivot/mango/mango.error.ErrorCorrMatrix.xml +++ b/mivot/mango/mango.error.ErrorCorrMatrix.xml @@ -4,6 +4,7 @@ The correlation matrix is symmetrical. " --> + diff --git a/mivot/mango/mango.error.ErrorCovMatrix.xml b/mivot/mango/mango.error.ErrorCovMatrix.xml index 247e643..1372b44 100644 --- a/mivot/mango/mango.error.ErrorCovMatrix.xml +++ b/mivot/mango/mango.error.ErrorCovMatrix.xml @@ -3,6 +3,7 @@ The covariance matrix is symmetrical." --> + diff --git a/mivot/mango/mango.error.Symmetric1D.xml b/mivot/mango/mango.error.Symmetric1D.xml index cc0fb32..cb93ee1 100644 --- a/mivot/mango/mango.error.Symmetric1D.xml +++ b/mivot/mango/mango.error.Symmetric1D.xml @@ -2,5 +2,6 @@ + diff --git a/model/EpochPosition.png b/model/EpochPosition.png index b65b2f4..26e0e60 100644 Binary files a/model/EpochPosition.png and b/model/EpochPosition.png differ diff --git a/model/error.png b/model/error.png index 126a230..110873d 100644 Binary files a/model/error.png and b/model/error.png differ diff --git a/model/mango.xmi b/model/mango.xmi index 89add5d..828d379 100644 --- a/model/mango.xmi +++ b/model/mango.xmi @@ -1,698 +1,668 @@ - - - - - + + + + + - + 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 - - - + + + - - + + Possible options to encode a shape in a string. - - + + STCs serialisation - - + + MOC serialisation - - - - + + + + - + - - + + - - - + + + - - - - + + + + - - - - - - - - - - + + + + + + + - - - - + + + + - - - + + + - - + + - - - - + + + + - - + + - - - - + + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - + + + + - - - - - + + + - - + + Science ready data with the instrument signature removed (ObsCore). - - + + Raw instrumental data, in a proprietary or internal data provider defined format, that needs instrument specific tools to be handled (ObsCore). - - + + Instrumental data in a standard format which could be manipulated with standard astronomical packages (ObsCore). - - + + Science ready data with the instrument signature removed (ObsCore). - - + + 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. - - - Parallax error. This error is meant to be symetrical. - - - - - - Error in the radial velocity. This error is meant to be symetrical. - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + 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. - - + + Diagonal 2D matrix. Non diagonal elements are null. - - - + + + First diagonal element ($(x_11)$) - - + + Second diagonal element ($(x_22)$) - + - - + + 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 - + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + Class representing the origin of the data following the DCP note (TBD) - - + + - - + + - - + + - - + + Dataset idnetifier that can be used for citation (e.g. DOI) - - + + Dataset landing page - - + + Dataset version - - + + Person(s) mainly involved in the creation of the resource, generally the author. - - + + Identifier (IVOID, DOI or Bibcode) of a second resource using relation of type \texttt{cites} (\url{https://www.ivoa.net/rdf/voresource/relationship_type/}) - - + + Identifier (IVOID, DOI or Bibcode) of a second resource using relation of type \texttt{is_derived_from} (\url{https://www.ivoa.net/rdf/voresource/relationship_type/}) - - + + Date of the original resource from which the MANGO source instance is derived - - - + + + - - - + + + - - - + + + - - + + Reference article for the MANGO source - - + + Article editor name - - + + Bibcode or DOI of the reference article - - - + + + IVOID of the underlying data collection - - + + Data center that produced the MANGOI source instance - - + + Version of the software the produced the MANO source instance. It is encouraged to follow \url{https://ivoa.net/documents/Notes/softid/index.html}. - - + + IVOID of the protocol through which the data was retrieved - - + + Full request URL including a query string. For the simple protocols,put the url-encoded form of the query parameters. For TAP queries, use the /sync UWS URL. The format is free for others request types. - - + + Input query in a formal langage such as ADQL. - - + + Query execution date - - + + Email or URL to contact the publisher - - + + Place holder for the license covering the MANGO instance - - + + 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. - - + + License or Copyright text - - - + + + + + + + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/model/property.png b/model/property.png index 2617e74..d99cec7 100644 Binary files a/model/property.png and b/model/property.png differ diff --git a/utils/__pycache__/processVodml.cpython-310.pyc b/utils/__pycache__/processVodml.cpython-310.pyc new file mode 100644 index 0000000..a68c8e7 Binary files /dev/null and b/utils/__pycache__/processVodml.cpython-310.pyc differ diff --git a/vo-dml/desc.mango.vo-dml.xml b/vo-dml/desc.mango.vo-dml.xml index 6ab580e..e4c636c 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 - 2024-10-17T16:22:43 + 2024-12-05T15:05:29 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -482,9 +482,8 @@ Each value has its own free text description. PhotometricProperty PhotometricProperty - Observed brightness of the \texttt{MangoObject}. -The distinction between fluxes and magnitudes is made by the unit. -This property should refer to a photometric calibration as defined by the \texttt{Phot} data model (1.1). + Super class for all photometric properties of the \texttt{MangoObject}. + mango:Property @@ -501,31 +500,18 @@ as defined by the \texttt{PhotDM} model. 1 - + PhotometricProperty.error error Error on the \texttt{PhotometricProperty}, imported from \texttt{meas:Uncertainty}. meas:Uncertainty - - 0 - 1 - - - - PhotometricProperty.photCal - photCal - Photometric calibration that applies to the photometric property. -It must be an instance of \texttt{photdm:PhotCal}. - - Phot:PhotCal - 1 1 - + @@ -883,54 +869,54 @@ providers to convey whether or not the factor has been applied (see \texttt{meas EpochPositionErrors EpochPositionErrors Class holder for the errors of the EpochPosition attributes - + EpochPositionErrors.parallax parallax Parallax error. This error is meant to be symmetrical in the current model version. - mango:error.Symmetric1D + mango:error.PropertyError - 0 + 1 1 - - + + EpochPositionErrors.radialVelocity radialVelocity Error in the radial velocity. This error is meant to be symmetrical in the current model version. - mango:error.Symmetric1D + mango:error.PropertyError - 0 + 1 1 - - - EpochPositionErrors.position - position + + + EpochPositionErrors.properMotion + properMotion Position error; can be an ellipse, a correlation matrix or a covariance matrix. - mango:error.PropertyError2D + mango:error.PropertyError - 0 + 1 1 - - - EpochPositionErrors.properMotion - properMotion + + + EpochPositionErrors.Position + Position Position error; can be an ellipse, a correlation matrix or a covariance matrix. - mango:error.PropertyError2D + mango:error.PropertyError - 0 + 1 1 - + @@ -1071,6 +1057,30 @@ providers to convey whether or not the factor has been applied (see \texttt{meas + + Brightness + Brightness + Observed brightness of the \texttt{MangoObject}. +The distinction between fluxes and magnitudes is made by the unit. +This property should refer to a photometric calibration as defined by the \texttt{Phot} data model (1.1). + + mango:PhotometricProperty + + + Brightness.photCal + photCal + Photometric calibration that applies to the photometric property. +It must be an instance of \texttt{photdm:PhotCal}. + + Phot:PhotCal + + + 1 + 1 + + + + @@ -1102,6 +1112,20 @@ The confidence level must be in $[0, 1]$ (not enforced by the VO-DML schema).1 + + error.PropertyError.distribution + distribution + + TODO : Missing description : please, update your UML model asap. + + + ivoa:string + + + 1 + 1 + + @@ -1131,7 +1155,7 @@ The confidence level must be in $[0, 1]$ (not enforced by the VO-DML schema).Covariance matrix for the error of a 2D quantities. The covariance matrix is symmetrical. - mango:error.PropertyError2D + mango:error.PropertyError error.ErrorCovMatrix.variance1 @@ -1176,9 +1200,9 @@ The covariance matrix is symmetrical. Ellipse Elliptic error for 2D parameters such as sky positions. Major axis and minor axis have their own units, which must be the same for both. -This is not enforced by the model. +This is not enforced by the model. The definition of the ellipse attribute is imported from \texttt{coords:Ellipse}. - mango:error.PropertyError2D + mango:error.PropertyError error.Ellipse.semiMajorAxis @@ -1220,15 +1244,6 @@ The angle has its own unit. - - error.PropertyError2D - PropertyError2D - Super (abstract) class for all errors of 2D parameters - - mango:error.PropertyError - - - error.ErrorCorrMatrix ErrorCorrMatrix @@ -1236,7 +1251,7 @@ The angle has its own unit. The correlation matrix is symmetrical. - mango:error.PropertyError2D + mango:error.PropertyError error.ErrorCorrMatrix.sigma1 diff --git a/vo-dml/desc/desc.PhotometricProperty.photCal.txt b/vo-dml/desc/desc.Brightness.photCal.txt similarity index 100% rename from vo-dml/desc/desc.PhotometricProperty.photCal.txt rename to vo-dml/desc/desc.Brightness.photCal.txt diff --git a/vo-dml/desc/desc.Brightness.txt b/vo-dml/desc/desc.Brightness.txt new file mode 100644 index 0000000..ed2006b --- /dev/null +++ b/vo-dml/desc/desc.Brightness.txt @@ -0,0 +1,3 @@ +Observed brightness of the \texttt{MangoObject}. +The distinction between fluxes and magnitudes is made by the unit. +This property should refer to a photometric calibration as defined by the \texttt{Phot} data model (1.1). \ No newline at end of file diff --git a/vo-dml/desc/desc.PhotometricProperty.txt b/vo-dml/desc/desc.PhotometricProperty.txt index ed2006b..3876c29 100644 --- a/vo-dml/desc/desc.PhotometricProperty.txt +++ b/vo-dml/desc/desc.PhotometricProperty.txt @@ -1,3 +1 @@ -Observed brightness of the \texttt{MangoObject}. -The distinction between fluxes and magnitudes is made by the unit. -This property should refer to a photometric calibration as defined by the \texttt{Phot} data model (1.1). \ No newline at end of file +Super class for all photometric properties of the \texttt{MangoObject}. diff --git a/vo-dml/desc/desc.error.Ellipse.txt b/vo-dml/desc/desc.error.Ellipse.txt index f4167a8..77ee7ef 100644 --- a/vo-dml/desc/desc.error.Ellipse.txt +++ b/vo-dml/desc/desc.error.Ellipse.txt @@ -1,3 +1,3 @@ Elliptic error for 2D parameters such as sky positions. Major axis and minor axis have their own units, which must be the same for both. -This is not enforced by the model. \ No newline at end of file +This is not enforced by the model. The definition of the ellipse attribute is imported from \texttt{coords:Ellipse}. \ No newline at end of file diff --git a/vo-dml/desc/desc.error.PropertyError.distribution.txt b/vo-dml/desc/desc.error.PropertyError.distribution.txt new file mode 100644 index 0000000..88b6738 --- /dev/null +++ b/vo-dml/desc/desc.error.PropertyError.distribution.txt @@ -0,0 +1,2 @@ +Statistical distribution of the error. +The Value must comply with VO vocabulary TBD (not enforced by the VO-DML schema). \ No newline at end of file diff --git a/vo-dml/desc/desc.error.PropertyError2D.txt b/vo-dml/desc/desc.error.PropertyError2D.txt deleted file mode 100644 index 44d32c8..0000000 --- a/vo-dml/desc/desc.error.PropertyError2D.txt +++ /dev/null @@ -1 +0,0 @@ -Super (abstract) class for all errors of 2D parameters \ No newline at end of file diff --git a/vo-dml/mango.png b/vo-dml/mango.png index f2f0de6..7d75cf5 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 f47b648..9e8de94 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 - 2024-10-17T16:22:43 + 2024-12-05T15:05:29 ivoa http://www.ivoa.net/xml/VODML/IVOA-v1.vo-dml.xml @@ -510,7 +510,7 @@ As long as the vocabulary is not set, the possible values of this attribute are 1 - + PhotometricProperty.error error @@ -519,25 +519,11 @@ As long as the vocabulary is not set, the possible values of this attribute are meas:Uncertainty - - 0 - 1 - - - - PhotometricProperty.photCal - photCal - - TODO : Missing description : please, update your UML model asap. - - - Phot:PhotCal - 1 1 - + @@ -904,58 +890,62 @@ As long as the vocabulary is not set, the possible values of this attribute are EpochPositionErrors EpochPositionErrors 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. - + EpochPositionErrors.parallax parallax - Parallax error. This error is meant to be symetrical. + + TODO : Missing description : please, update your UML model asap. + - mango:error.Symmetric1D + mango:error.PropertyError - 0 + 1 1 - - + + EpochPositionErrors.radialVelocity radialVelocity - Error in the radial velocity. This error is meant to be symetrical. + + TODO : Missing description : please, update your UML model asap. + - mango:error.Symmetric1D + mango:error.PropertyError - 0 + 1 1 - - - EpochPositionErrors.position - position + + + EpochPositionErrors.properMotion + properMotion TODO : Missing description : please, update your UML model asap. - mango:error.PropertyError2D + mango:error.PropertyError - 0 + 1 1 - - - EpochPositionErrors.properMotion - properMotion + + + EpochPositionErrors.Position + Position TODO : Missing description : please, update your UML model asap. - mango:error.PropertyError2D + mango:error.PropertyError - 0 + 1 1 - + @@ -1118,6 +1108,31 @@ As long as the vocabulary is not set, the possible values of this attribute are + + Brightness + Brightness + + TODO : Missing description : please, update your UML model asap. + + + mango:PhotometricProperty + + + Brightness.photCal + photCal + + TODO : Missing description : please, update your UML model asap. + + + Phot:PhotCal + + + 1 + 1 + + + + @@ -1146,6 +1161,20 @@ As long as the vocabulary is not set, the possible values of this attribute are 1 + + error.PropertyError.distribution + distribution + + TODO : Missing description : please, update your UML model asap. + + + ivoa:string + + + 1 + 1 + + @@ -1174,7 +1203,7 @@ As long as the vocabulary is not set, the possible values of this attribute are ErrorCovMatrix Diagonal 2D matrix. Non diagonal elements are null. - mango:error.PropertyError2D + mango:error.PropertyError error.ErrorCovMatrix.variance1 @@ -1221,7 +1250,7 @@ As long as the vocabulary is not set, the possible values of this attribute are Ellipse Elliptical errror for 2D parameters such as the sky positions. - mango:error.PropertyError2D + mango:error.PropertyError error.Ellipse.semiMajorAxis @@ -1261,17 +1290,6 @@ As long as the vocabulary is not set, the possible values of this attribute are - - error.PropertyError2D - PropertyError2D - - TODO : Missing description : please, update your UML model asap. - - - mango:error.PropertyError - - - error.ErrorCorrMatrix ErrorCorrMatrix @@ -1279,7 +1297,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. - mango:error.PropertyError2D + mango:error.PropertyError error.ErrorCorrMatrix.sigma1