[Volute] r3942 - trunk/projects/dm/vo-dml/models/tesselation

Volute commit messages volutecommits at g-vo.org
Wed Apr 12 14:02:09 CEST 2017


Author: lmichel
Date: Wed Apr 12 14:02:09 2017
New Revision: 3942

Log:
small fixes

Modified:
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml	Wed Apr 12 14:00:01 2017	(r3941)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.votable.annot.xml	Wed Apr 12 14:02:09 2017	(r3942)
@@ -1,6 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <VOTABLE xmlns="http://www.ivoa.net/xml/VOTable/v1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.3">
-	
+  <VODML>
+    <MODEL>
+      <NAME>ivoa</NAME>
+      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
+    </MODEL>
+    <MODEL>
+      <NAME>coordsys_tessel</NAME>
+      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coordsys_tessel.vo-dml.xml</URL>
+      <IDENTIFIER>ivo://ivoa.org/dm/sample/CoordSysTessel/0.1</IDENTIFIER>
+    </MODEL>
+    <MODEL>
+      <NAME>coords_tessel</NAME>
+      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/coords_tessel.vo-dml.xml</URL>
+      <IDENTIFIER>ivo://ivoa.org/dm/sample/CoordsTessel/0.1</IDENTIFIER>
+    </MODEL>
+    <MODEL>
+      <NAME>lmsource</NAME>
+      <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/tesselation/lmsource.vo-dml.xml</URL>
+      <IDENTIFIER>ivo://ivoa.org/dm/sample/LMSource/0.1</IDENTIFIER>
+    </MODEL>
+    <GLOBALS ID="_MyFirstGlobal">
+      <INSTANCE dmtype="coordsys_tessel:domain.spatial.SpaceFrame" ID="_coordspaceframe">
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.origin">
+          <LITERAL value="TOPOCENTER" dmtype="coordsys_tessel:domain.spatial.SpatialLocation"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.orientation">
+          <LITERAL value="ICRS" dmtype="coordsys_tessel:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.equinox">
+          <LITERAL value="2015" dmtype="coordsys_tessel:domain.spatial.Epoch"/>
+        </ATTRIBUTE>
+      </INSTANCE>
+      <INSTANCE dmtype="coordsys_tessel:domain.spatial.SpaceFrame" ID="_healpixspaceframe">
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.origin">
+          <LITERAL value="TOPOCENTER" dmtype="coordsys_tessel:domain.spatial.SpatialLocation"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.orientation">
+          <LITERAL value="ICRS" dmtype="coordsys_tessel:domain.spatial.StdRefFrame"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.equinox">
+          <LITERAL value="2000" dmtype="coordsys_tessel:domain.spatial.Epoch"/>
+        </ATTRIBUTE>
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.coordSpace">
+          <IDREF>_healpixframe</IDREF>
+        </REFERENCE>
+      </INSTANCE>
+      <INSTANCE dmtype="coordsys_tessel:domain.spatial.Healpix" ID="_healpixframe">
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.Healpix.Schema">
+          <CONSTANT dmtype="coordsys_tessel:domain.spatial.HealpixScheme" ref="_healpix_schema">
+          <!-- generated by Jovial <LITERAL value="NESTED" dmtype="coordsys_tessel:domain.spatial.HealpixSchema"/> -->
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.Healpix.norder">
+          <CONSTANT dmtype="ivoa:integer" ref="_healpix_order">
+          <!-- generated by Jovial <LITERAL value="13" dmtype="ivoa:integer"/> -->
+        </ATTRIBUTE>
+      </INSTANCE>
+    </GLOBALS>
+    <TEMPLATES tableref="_table1">
+      <INSTANCE dmtype="lmsource:source.Source" ID="_source">
+        <PRIMARYKEY>
+          <PKFIELD>
+            <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
+          </PKFIELD>
+        </PRIMARYKEY>
+        <ATTRIBUTE dmrole="lmsource:source.Source.name">
+          <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="lmsource:source.Source.position">
+          <INSTANCE dmtype="coords_tessel:domain.spatial.Position2D">
+            <COMPOSITION dmrole="coords_tessel:domain.spatial.Position.tile">
+              <INSTANCE dmtype="coords_tessel:domain.spatial.Tile">
+                <ATTRIBUTE dmrole="coord_tessel:domain.spatial.Tile.skyindex">
+                  <INSTANCE dmtype="coordsys_tessel:domain.spatial.Tile.skyindex">
+                    <ATTRIBUTE dmrole="coord_tessel:domain.spatial.SkyIndex.loc">
+                      <COLUMN dmtype="" ref="healpix_csa_100"/>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="lmsource:source.Source.position">
+          <INSTANCE dmtype="coords_tessel:domain.spatial.Position2D">
+            <ATTRIBUTE dmrole="coords_tessel:domain.spatial.Position2D.coord">
+              <INSTANCE dmtype="coordsys_tessel:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord.axis">
+                  <INSTANCE dmtype="coordsys_tessel:domain.spatial.CoordAxis">
+                    <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.Axis.name">
+                      <LITERAL value="ra" dmtype="ivoa:String"/>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord.loc">
+                  <COLUMN dmtype="ivoa:Quantity" ref="pos_ra_csa_100"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <ATTRIBUTE dmrole="coords_tessel:domain.spatial.Position2D.coord">
+              <INSTANCE dmtype="coordsys_tessel:domain.spatial.SpatialCoord">
+                <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord.axis">
+                  <INSTANCE dmtype="coordsys_tessel:domain.spatial.CoordAxis">
+                    <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.Axis.name">
+                      <LITERAL value="dec" dmtype="ivoa:String"/>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+                <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord.loc">
+                  <COLUMN dmtype="ivoa:Quantity" ref="pos_dec_csa_100"/>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </ATTRIBUTE>
+            <COMPOSITION dmrole="coords_tessel:domain.spatial.Position2D.error">
+              <INSTANCE dmtype="coords_tessel:domain.spatial.StatisticalError2D">
+                <ATTRIBUTE dmrole="coords_tessel:domain.spatial.StatisticalError2D.statError">
+                  <INSTANCE dmtype="coords_tessel:dtypes.dtypes.Ellipse">
+                    <ATTRIBUTE dmrole="coords_tessel:dtypes.Ellipse.posAngle">
+                      <LITERAL value="0" dmtype="ivoa:Quantity"/>
+                    </ATTRIBUTE>
+                    <ATTRIBUTE dmrole="semiAxis">
+                      <COLUMN dmtype="" ref="error_maj_csa_100"/>
+                    </ATTRIBUTE>
+                  </INSTANCE>
+                </ATTRIBUTE>
+              </INSTANCE>
+            </COMPOSITION>
+          </INSTANCE>
+        </ATTRIBUTE>
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.spaceFrame">
+          <IDREF>_coordspaceframe</IDREF>
+        </REFERENCE>
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.tesselation">
+          <IDREF>_healpixspaceframe</IDREF>
+        </REFERENCE>
+        <ATTRIBUTE dmrole="lmsource:source.Source.name">
+          <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
+        </ATTRIBUTE>
+        <ATTRIBUTE dmrole="lmsource:source.Source.parallax">
+          <COLUMN dmtype="ivoa:quantity.Quantity" ref="parallax_csa_100"/>
+        </ATTRIBUTE>
+      </INSTANCE>
+    </TEMPLATES>
+  </VODML>	
 <DESCRIPTION><![CDATA[
 SaadaDB:
    name : ThreeXMMdr6
@@ -23,8 +165,8 @@
 FROM CATALOGUE_ENTRY AS CATALOGUE_ENTRY]]></INFO>
 		<TABLE name="Results">
 			<GROUP ID="_healpix">
-				<PARAM name="healpix_schema" value="NESTED">
-				<PARAM name="healpix_order" value="13">
+				<PARAM name="healpix_schema" id="_healpix_schema" value="NESTED">
+				<PARAM name="healpix_order"  id="_healpix_order" value="13">
 			</GROUP>
 			<FIELD ID="namesaada_100" name="namesaada" datatype="char" ucd="meta.id" arraysize="*">
 				<DESCRIPTION>Attribute managed by Saada</DESCRIPTION>


More information about the Volutecommits mailing list