Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/MANGO.tex
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ \section{Model Overview}

\begin{itemize}[noitemsep,topsep=0pt,parsep=0pt,partopsep=0pt]

\item \texttt{dataOrigin} (origin of the \texttt{MangoObject}) : The structure of this class is based on
\item \texttt{queryOrigin} (origin of the \texttt{MangoObject}) : The structure of this class is based on
the recommendations of the DCP interest group \footnote{https://ivoa.net/documents/DataOrigin/index.html}.
\item \texttt{propertyDock} (place holder for all the \texttt{MangoObject} properties) :
This is an open-ended collection.
Expand Down
10 changes: 5 additions & 5 deletions doc/model.tex
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ \section{Model: mango }
\textbf{vodml-id: ColorDef.high} \newline
\textbf{type: Phot:PhotometryFilter} \newline
\textbf{multiplicity: 1} \newline
Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding to the higher band of the color.
Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding to the higher energy band of the color (lower mean wavelength).

\subsubsection{ColorDef.low}
\textbf{vodml-id: ColorDef.low} \newline
\textbf{type: Phot:PhotometryFilter} \newline
\textbf{multiplicity: 1} \newline
Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color.
Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower energy band for that color (larger mean wavelength).

\subsection{DataLink}
\label{sect:DataLink}
Expand Down Expand Up @@ -553,7 +553,7 @@ \section{Model: mango }
\begin{itemize}

\item[\textbf{ColorIndex}]: \textbf{vodml-id:} ColorDefinition.ColorIndex \newline
\textbf{description:} Difference of magnitudes: typically $M_B - M_v$
\textbf{description:} Difference of magnitudes: typically $M_B - M_V$
\item[\textbf{HardnessRatio}]: \textbf{vodml-id:} ColorDefinition.HardnessRatio \newline
\textbf{description:} Normalized ratio of fluxes: $(F_{EB2} - F_{EB1}) / (F_{EB2} + F_{EB1})$
\end{itemize}
Expand Down Expand Up @@ -682,7 +682,7 @@ \section{Package: origin }

\subsection{Article}
\label{sect:origin.Article}
Reference article for the \texttt{MangoObject}
Reference article for the \texttt{MangoObject}, usually a bibcode or DOI

\subsubsection{Article.editor}
\textbf{vodml-id: origin.Article.editor} \newline
Expand All @@ -694,7 +694,7 @@ \section{Package: origin }
\textbf{vodml-id: origin.Article.identifier} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
\textbf{multiplicity: 1} \newline
Identifer of the reference article
Identifier of the reference article

\subsection{DataOrigin}
\label{sect:origin.DataOrigin}
Expand Down
10 changes: 5 additions & 5 deletions doc/model_toc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -360,13 +360,13 @@ \section{Photometric and Spectroscopic Properties}
\textbf{vodml-id: ColorDef.high} \newline
\textbf{type: Phot:PhotometryFilter} \newline
\textbf{multiplicity: 1} \newline
Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding to the higher band of the color.
Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding to the higher energy band of the color (lower mean wavelength).

\subsubsection{ColorDef.low}
\textbf{vodml-id: ColorDef.low} \newline
\textbf{type: Phot:PhotometryFilter} \newline
\textbf{multiplicity: 1} \newline
Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color.
Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower energy band for that color (larger mean wavelength).

\subsection{ColorDefinition}
\label{sect:ColorDefinition}
Expand All @@ -376,7 +376,7 @@ \section{Photometric and Spectroscopic Properties}
\small
\begin{itemize}
\item \textbf{ColorIndex}: \textbf{vodml-id:} ColorDefinition.ColorIndex \newline
\textbf{description:} Difference of magnitudes: typically $M_B - M_v$
\textbf{description:} Difference of magnitudes: typically $M_B - M_V$
\item \textbf{HardnessRatio}: \textbf{vodml-id:} ColorDefinition.HardnessRatio \newline
\textbf{description:} Normalized ratio of fluxes: $(F_{EB2} - F_{EB1}) / (F_{EB2} + F_{EB1})$
\end{itemize}
Expand Down Expand Up @@ -720,7 +720,7 @@ \section{Package: origin}

\subsection{Article}
\label{sect:origin.Article}
Reference article for the \texttt{MangoObject}
Reference article for the \texttt{MangoObject}, usually a bibcode or DOI

\subsubsection{Article.editor}
\textbf{vodml-id: origin.Article.editor} \newline
Expand All @@ -732,5 +732,5 @@ \section{Package: origin}
\textbf{vodml-id: origin.Article.identifier} \newline
\textbf{type: \hyperref[sect:ivoa]{ivoa:string}} \newline
\textbf{multiplicity: 1} \newline
Identifer of the reference article
Identifier of the reference article

2 changes: 1 addition & 1 deletion mivot/mango/mango.MangoObject.xml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ This class specifies both type and role of the property, and hosts the property
<ATTRIBUTE dmrole="mango:origin.DataOrigin.rights_uri" dmtype="ivoa:string" ref="@@@@@" value=""/>
<COLLECTION dmrole="mango:origin.DataOrigin.articles">
<INSTANCE dmrole="mango:origin.DataOrigin.articles" dmtype="mango:origin.Article">
<!-- Reference article for the \texttt{MangoObject}" -->
<!-- Reference article for the \texttt{MangoObject}, usually a bibcode or DOI" -->
<ATTRIBUTE dmrole="mango:origin.Article.editor" dmtype="ivoa:string" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:origin.Article.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
</INSTANCE>
Expand Down
2 changes: 1 addition & 1 deletion mivot/mango/mango.origin.Article.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<INSTANCE dmrole="" dmtype="mango:origin.Article">
<!-- Reference article for the \texttt{MangoObject}" -->
<!-- Reference article for the \texttt{MangoObject}, usually a bibcode or DOI" -->
<ATTRIBUTE dmrole="mango:origin.Article.editor" dmtype="ivoa:string" ref="@@@@@" value=""/>
<ATTRIBUTE dmrole="mango:origin.Article.identifier" dmtype="ivoa:string" ref="@@@@@" value=""/>
</INSTANCE>
11 changes: 6 additions & 5 deletions vo-dml/desc.mango.vo-dml.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Using the polygon serialization requires the space coordinate system to be defin
<literal>
<vodml-id>ColorDefinition.ColorIndex</vodml-id>
<name>ColorIndex</name>
<description>Difference of magnitudes: typically $M_B - M_v$</description>
<description>Difference of magnitudes: typically $M_B - M_V$</description>
</literal>
<literal>
<vodml-id>ColorDefinition.HardnessRatio</vodml-id>
Expand Down Expand Up @@ -647,7 +647,7 @@ with a square transfer function.</description>
<vodml-id>ColorDef.high</vodml-id>
<name>high</name>
<description>Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding
to the higher band of the color.
to the higher energy band of the color (lower mean wavelength).
</description>
<datatype>
<vodml-ref>Phot:PhotometryFilter</vodml-ref>
Expand All @@ -660,7 +660,8 @@ to the higher band of the color.
<reference>
<vodml-id>ColorDef.low</vodml-id>
<name>low</name>
<description>Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color.
<description>Reference to the \texttt{Phot:PhotometryFilter} corresponding
to the lower energy band for that color (larger mean wavelength).
</description>
<datatype>
<vodml-ref>Phot:PhotometryFilter</vodml-ref>
Expand Down Expand Up @@ -1391,7 +1392,7 @@ group (see \url{https://ivoa.net/documents/DataOrigin/index.html}).</description
<objectType>
<vodml-id>origin.Article</vodml-id>
<name>Article</name>
<description>Reference article for the \texttt{MangoObject}</description>
<description>Reference article for the \texttt{MangoObject}, usually a bibcode or DOI</description>
<attribute>
<vodml-id>origin.Article.editor</vodml-id>
<name>editor</name>
Expand All @@ -1407,7 +1408,7 @@ group (see \url{https://ivoa.net/documents/DataOrigin/index.html}).</description
<attribute>
<vodml-id>origin.Article.identifier</vodml-id>
<name>identifier</name>
<description>Identifer of the reference article</description>
<description>Identifier of the reference article</description>
<datatype>
<vodml-ref>ivoa:string</vodml-ref>
</datatype>
Expand Down
2 changes: 1 addition & 1 deletion vo-dml/desc/desc.ColorDef.high.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Reference to the \texttt{Phot:PhotometryFilter} \citep{2022ivoa.spec.1101S} corresponding
to the higher band of the color.
to the higher energy band of the color (lower mean wavelength).
3 changes: 2 additions & 1 deletion vo-dml/desc/desc.ColorDef.low.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Reference to the \texttt{Phot:PhotometryFilter} corresponding to the lower band for that color.
Reference to the \texttt{Phot:PhotometryFilter} corresponding
to the lower energy band for that color (larger mean wavelength).
2 changes: 1 addition & 1 deletion vo-dml/desc/desc.ColorDefinition.ColorIndex.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Difference of magnitudes: typically $M_B - M_v$
Difference of magnitudes: typically $M_B - M_V$
2 changes: 1 addition & 1 deletion vo-dml/desc/desc.origin.Article.identifier.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Identifer of the reference article
Identifier of the reference article
2 changes: 1 addition & 1 deletion vo-dml/desc/desc.origin.Article.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Reference article for the \texttt{MangoObject}
Reference article for the \texttt{MangoObject}, usually a bibcode or DOI
Loading