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

Volute commit messages volutecommits at g-vo.org
Wed Apr 12 13:48:50 CEST 2017


Author: lmichel
Date: Wed Apr 12 13:48:50 2017
New Revision: 3940

Log:
small fixes

Modified:
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy
   trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy	Wed Apr 12 13:48:23 2017	(r3939)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy	Wed Apr 12 13:48:50 2017	(r3940)
@@ -43,18 +43,18 @@
         /*
          * SpaceFrame of the source position
          */
-        instance(type: "coordsys:domain.spatial.SpaceFrame", id: "_coordspaceframe") {
-          instance(type: "coordsys:domain.spatial.SpatialLocation", role: "coordsys:domain.spatial.SpaceFrame.origin"     , value: "TOPOCENTER")
-          instance(type: "coordsys:domain.spatial.StdRefFrame",     role: "coordsys:domain.spatial.SpaceFrame.orientation", value: "ICRS")
-          instance(type: "coordsys:domain.spatial.Epoch",           role: "coordsys:domain.spatial.SpaceFrame.equinox"    , value: "2015")
+        instance(type: "coordsys_tessel:domain.spatial.SpaceFrame", id: "_coordspaceframe") {
+          instance(type: "coordsys_tessel:domain.spatial.SpatialLocation", role: "coordsys_tessel:domain.spatial.SpaceFrame.origin"     , value: "TOPOCENTER")
+          instance(type: "coordsys_tessel:domain.spatial.StdRefFrame",     role: "coordsys_tessel:domain.spatial.SpaceFrame.orientation", value: "ICRS")
+          instance(type: "coordsys_tessel:domain.spatial.Epoch",           role: "coordsys_tessel:domain.spatial.SpaceFrame.equinox"    , value: "2015")
         }
         /*
          * SpaceFrame of the healpix indexation
          */
-        instance(type: "coordsys:domain.spatial.SpaceFrame", id: "_healpixspaceframe") {
-          instance(type: "coordsys:domain.spatial.SpatialLocation", role: "coordsys:domain.spatial.SpaceFrame.origin"     , value: "TOPOCENTER")
-          instance(type: "coordsys:domain.spatial.StdRefFrame",     role: "coordsys:domain.spatial.SpaceFrame.orientation", value: "ICRS")
-          instance(type: "coordsys:domain.spatial.Epoch",           role: "coordsys:domain.spatial.SpaceFrame.equinox"    , value: "2000")
+        instance(type: "coordsys_tessel:domain.spatial.SpaceFrame", id: "_healpixspaceframe") {
+          instance(type: "coordsys_tessel:domain.spatial.SpatialLocation", role: "coordsys_tessel:domain.spatial.SpaceFrame.origin"     , value: "TOPOCENTER")
+          instance(type: "coordsys_tessel:domain.spatial.StdRefFrame",     role: "coordsys_tessel:domain.spatial.SpaceFrame.orientation", value: "ICRS")
+          instance(type: "coordsys_tessel:domain.spatial.Epoch",           role: "coordsys_tessel:domain.spatial.SpaceFrame.equinox"    , value: "2000")
           reference(role: "coordSpace") {
             idref("_healpixframe")      
           }
@@ -62,9 +62,9 @@
         /*
          * Healpix parameters
          */
-        instance(type: "coordsys:domain.spatial.Healpix", id: "_healpixframe") {
-          instance(type: "oordsys:domain.spatial.HealpixSchema", role: "coordsys:domain.spatial.Healpix.Schema", value: "NESTED")
-          instance(type: "ivoa:integer",  role: "coordsys:domain.spatial.Healpix.norder", value: "13")
+        instance(type: "coordsys_tessel:domain.spatial.Healpix", id: "_healpixframe") {
+          instance(type: "coordsys_tessel:domain.spatial.HealpixSchema", role: "coordsys_tessel:domain.spatial.Healpix.Schema", value: "NESTED")
+          instance(type: "ivoa:integer",  role: "coordsys_tessel:domain.spatial.Healpix.norder", value: "13")
          }
     }
    	/*
@@ -81,51 +81,49 @@
 			/*
 			 * One Source instance per data row
 			 */  
-            instance(type: "source.Source", id: "_source") {
+            instance(type: "lmsource:source.Source", id: "_source") {
 				// taking the name as primary key (works for this example)
                 pk() {
-                    column(role: "name", id: "namesaada_100", data: nameesaada) 
+                    column(role: "lmsource:source.Source.name", id: "namesaada_100", data: nameesaada) 
                 }
-                column(role: "name", id: "namesaada_100", data: nameesaada)
+                column(role: "lmsource:source.Source.name", id: "namesaada_100", data: nameesaada)
                 // Position2D component: RA/DEC + error
-                instance(role: "source.Source.position", type: "coords_tessel:domain.spatial.Position2D") {
-                	instance(role: "coords_tessel:domain.spatial.Position.tile"){
-                	    instance(role: "coordsys_tessel:domain.spatial.SkyIndex"){
-							column(role: "loc", id: "healpix_csa_100", data: healpix_csa)
+                instance(role: "lmsource:source.Source.position", type: "coords_tessel:domain.spatial.Position2D") {
+                	instance(role: "coords_tessel:domain.spatial.Position.tile", type:"coords_tessel:domain.spatial.Tile"){
+                	    instance(role: "coord_tessel:domain.spatial.Tile.skyindex", type: "coordsys_tessel:domain.spatial.Tile.skyindex"){
+							column(role: "coord_tessel:domain.spatial.SkyIndex.loc", id: "healpix_csa_100", data: healpix_csa)
                		      } 
                		    }
-                		instance(role: "coords_tessel:domain.spatial.Position2D") {
-                		  instance(role: "coord") {
-                 		  	instance(role: "coordsys_tessel:domain.spatial.SpatialCoord") {
-                 		      column(role: "longitude", id: "pos_ra_csa_100", data: pos_ra_csa)
-                 		        instance(role: "axis"){
-                 		          instance(type: "ivoa:String", role: "name", value: "ra")
-                 		        }
-                		  	}
-                 		  	instance(role: "coordsys_tessel:domain.spatial.SpatialCoord") {
-                 		      column(role: "latitude", id: "pos_dec_csa_100", data: pos_dec_csa)
-                 		        instance(role: "axis"){
-                 		          instance(type: "ivoa:String", role: "name", value: "dec")
-                 		        }
-                		  	}
-                		  }
-               		      instance(role: "error") {
-                 		  	instance(role: "domain.spatial.StatisticalError2D") {
-                  		  		instance(role: "statError", type: "dtypes.Ellipse") {
-                 		          column(role: "semiAxis", id: "error_maj_csa_100", data: error_maj_csa)
-                 		          instance(type: "ivoa:Quantity", role: "posAngle", value: "0")
-                 		  	    }
-                		     }
-                		  }
-                        }
+               		}
+                	instance(role: "lmsource:source.Source.position", type: "coords_tessel:domain.spatial.Position2D") {
+                	  // Position2D.coord is an attribute with a multiplicity of 2
+                	  instance(role: "coords_tessel:domain.spatial.Position2D.coord", type: "coordsys_tessel:domain.spatial.SpatialCoord") {
+                 	      column(role: "coordsys_tessel:domain.spatial.SpatialCoord.loc", id: "pos_ra_csa_100", data: pos_ra_csa)
+                 	      instance(role: "coordsys_tessel:domain.spatial.SpatialCoord.axis", type: "coordsys_tessel:domain.spatial.CoordAxis"){
+                 	      	instance(type: "ivoa:String", role: "name", value: "ra")
+                 	      }
+                	   }
+                	  instance(role: "coords_tessel:domain.spatial.Position2D.coord", type: "coordsys_tessel:domain.spatial.SpatialCoord") {
+                 	      column(role: "coordsys_tessel:domain.spatial.SpatialCoord.loc", id: "pos_dec_csa_100", data: pos_dec_csa)
+                 	      instance(role: "coordsys_tessel:domain.spatial.SpatialCoord.axis", type: "coordsys_tessel:domain.spatial.CoordAxis"){
+                 	        instance(type: "ivoa:String", role: "name", value: "dec")
+                 	       }
+                	  }
+                	  
+               		  instance(role: "coords_tessel:domain.spatial.Position2D.error", type: "coords_tessel:domain.spatial.StatisticalError2D") {
+                  	  	instance(role: "coords_tessel:domain.spatial.StatisticalError2D.statError", type: "coords_tessel:dtypes.dtypes.Ellipse") {
+                 	      column(role: "semiAxis", id: "error_maj_csa_100", data: error_maj_csa)
+                 	      instance(role: "coords_tessel:dtypes.Ellipse.posAngle",type: "ivoa:Quantity", value: "0")    
+                	     }
+                	  }    
                  }
                  // Just to look a little bit like Gaia
-                 column(role: "parallax", id: "parallax_csa_100", data: parallax_csa)
+                 column(role: "lmsource:source.Source.parallax", id: "parallax_csa_100", data: parallax_csa)
                  // Association with both space frame (don't know how to tell Jovial to make an association)
-                 reference(role: "spaceFrame") {
+                 reference(role: "coordsys_tessel:domain.spatial.spaceFrame") {
                    idref("_coordspaceframe")
                  }
-                 reference(role: "tesselation") {
+                 reference(role: "coordsys_tessel:domain.spatial.tesselation") {
                    idref("_healpixspaceframe")
                  }
             }

Modified: trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml
==============================================================================
--- trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml	Wed Apr 12 13:48:23 2017	(r3939)
+++ trunk/projects/dm/vo-dml/models/tesselation/lmsource.groovy.output.xml	Wed Apr 12 13:48:50 2017	(r3940)
@@ -5,135 +5,137 @@
       <URL>http://volute.g-vo.org/svn/trunk/projects/dm/vo-dml/models/ivoa/IVOA.vo-dml.xml</URL>
     </MODEL>
     <MODEL>
-      <NAME>coordsys</NAME>
+      <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/Tessel/0.1</IDENTIFIER>
+      <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="null" ID="_coordspaceframe">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <LITERAL value="TOPOCENTER" dmtype="coordsys:domain.spatial.SpatialLocation"/>
+      <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:domain.spatial.SpaceFrame.orientation">
-          <LITERAL value="ICRS" dmtype="coordsys:domain.spatial.StdRefFrame"/>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.orientation">
+          <LITERAL value="ICRS" dmtype="coordsys_tessel:domain.spatial.StdRefFrame"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <LITERAL value="2015" dmtype="coordsys:domain.spatial.Epoch"/>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.equinox">
+          <LITERAL value="2015" dmtype="coordsys_tessel:domain.spatial.Epoch"/>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="null" ID="_healpixspaceframe">
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.origin">
-          <LITERAL value="TOPOCENTER" dmtype="coordsys:domain.spatial.SpatialLocation"/>
+      <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:domain.spatial.SpaceFrame.orientation">
-          <LITERAL value="ICRS" dmtype="coordsys:domain.spatial.StdRefFrame"/>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.orientation">
+          <LITERAL value="ICRS" dmtype="coordsys_tessel:domain.spatial.StdRefFrame"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coordsys:domain.spatial.SpaceFrame.equinox">
-          <LITERAL value="2000" dmtype="coordsys:domain.spatial.Epoch"/>
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.equinox">
+          <LITERAL value="2000" dmtype="coordsys_tessel:domain.spatial.Epoch"/>
         </ATTRIBUTE>
-        <REFERENCE dmrole="coordSpace">
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.SpaceFrame.coordSpace">
           <IDREF>_healpixframe</IDREF>
         </REFERENCE>
       </INSTANCE>
-      <INSTANCE dmtype="null" ID="_healpixframe">
-        <ATTRIBUTE dmrole="Schema">
-          <LITERAL value="NESTED" dmtype="HealpixSchema"/>
+      <INSTANCE dmtype="coordsys_tessel:domain.spatial.Healpix" ID="_healpixframe">
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.Healpix.Schema">
+          <LITERAL value="NESTED" dmtype="coordsys_tessel:domain.spatial.HealpixSchema"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="norder">
+        <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.Healpix.norder">
           <LITERAL value="13" dmtype="ivoa:integer"/>
         </ATTRIBUTE>
       </INSTANCE>
     </GLOBALS>
     <TEMPLATES tableref="_table1">
-      <INSTANCE dmtype="source.Source" ID="_source">
+      <INSTANCE dmtype="lmsource:source.Source" ID="_source">
         <PRIMARYKEY>
           <PKFIELD>
             <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
           </PKFIELD>
         </PRIMARYKEY>
-        <ATTRIBUTE dmrole="name">
-          <COLUMN dmtype="" ref="namesaada_100"/>
+        <ATTRIBUTE dmrole="lmsource:source.Source.name">
+          <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="source.Source.position">
+        <ATTRIBUTE dmrole="lmsource:source.Source.position">
           <INSTANCE dmtype="coords_tessel:domain.spatial.Position2D">
-            <ATTRIBUTE dmrole="coords_tessel:domain.spatial.Position.tile">
-              <INSTANCE dmtype="null">
-                <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SkyIndex">
-                  <INSTANCE dmtype="null">
-                    <ATTRIBUTE dmrole="loc">
+            <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>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coords_tessel:domain.spatial.Position2D">
-              <INSTANCE dmtype="null">
-                <ATTRIBUTE dmrole="coord">
-                  <INSTANCE dmtype="null">
-                    <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord">
-                      <INSTANCE dmtype="null">
-                        <ATTRIBUTE dmrole="axis">
-                          <INSTANCE dmtype="null">
-                            <ATTRIBUTE dmrole="name">
-                              <LITERAL value="ra" dmtype="ivoa:String"/>
-                            </ATTRIBUTE>
-                          </INSTANCE>
-                        </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="longitude">
-                          <COLUMN dmtype="" ref="pos_ra_csa_100"/>
-                        </ATTRIBUTE>
-                      </INSTANCE>
-                    </ATTRIBUTE>
-                    <ATTRIBUTE dmrole="coordsys_tessel:domain.spatial.SpatialCoord">
-                      <INSTANCE dmtype="null">
-                        <ATTRIBUTE dmrole="axis">
-                          <INSTANCE dmtype="null">
-                            <ATTRIBUTE dmrole="name">
-                              <LITERAL value="dec" dmtype="ivoa:String"/>
-                            </ATTRIBUTE>
-                          </INSTANCE>
-                        </ATTRIBUTE>
-                        <ATTRIBUTE dmrole="latitude">
-                          <COLUMN dmtype="" ref="pos_dec_csa_100"/>
-                        </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="error">
-                  <INSTANCE dmtype="null">
-                    <ATTRIBUTE dmrole="domain.spatial.StatisticalError2D">
-                      <INSTANCE dmtype="null">
-                        <ATTRIBUTE dmrole="statError">
-                          <INSTANCE dmtype="dtypes.Ellipse">
-                            <ATTRIBUTE dmrole="posAngle">
-                              <LITERAL value="0" dmtype="ivoa:Quantity"/>
-                            </ATTRIBUTE>
-                            <ATTRIBUTE dmrole="semiAxis">
-                              <COLUMN dmtype="" ref="error_maj_csa_100"/>
-                            </ATTRIBUTE>
-                          </INSTANCE>
-                        </ATTRIBUTE>
-                      </INSTANCE>
+                <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="spaceFrame">
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.spaceFrame">
           <IDREF>_coordspaceframe</IDREF>
         </REFERENCE>
-        <REFERENCE dmrole="tesselation">
+        <REFERENCE dmrole="coordsys_tessel:domain.spatial.tesselation">
           <IDREF>_healpixspaceframe</IDREF>
         </REFERENCE>
-        <ATTRIBUTE dmrole="name">
-          <COLUMN dmtype="" ref="namesaada_100"/>
+        <ATTRIBUTE dmrole="lmsource:source.Source.name">
+          <COLUMN dmtype="ivoa:string" ref="namesaada_100"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="parallax">
-          <COLUMN dmtype="" ref="parallax_csa_100"/>
+        <ATTRIBUTE dmrole="lmsource:source.Source.parallax">
+          <COLUMN dmtype="ivoa:quantity.Quantity" ref="parallax_csa_100"/>
         </ATTRIBUTE>
       </INSTANCE>
     </TEMPLATES>


More information about the Volutecommits mailing list