[Volute] r4935 - in trunk/projects/dm: Cube/examples/vot STC/examples/vot

Volute commit messages volutecommits at g-vo.org
Thu Apr 26 22:13:32 CEST 2018


Author: mdittmar
Date: Thu Apr 26 22:13:31 2018
New Revision: 4935

Log:
update examples to TimeOffset change

Modified:
   trunk/projects/dm/Cube/examples/vot/sparsecube_1.vot
   trunk/projects/dm/Cube/examples/vot/sparsecube_1a.vot
   trunk/projects/dm/Cube/examples/vot/sparsecube_1b.vot
   trunk/projects/dm/STC/examples/vot/time_mjd.vot
   trunk/projects/dm/STC/examples/vot/time_offset.vot

Modified: trunk/projects/dm/Cube/examples/vot/sparsecube_1.vot
==============================================================================
--- trunk/projects/dm/Cube/examples/vot/sparsecube_1.vot	Thu Apr 26 22:04:23 2018	(r4934)
+++ trunk/projects/dm/Cube/examples/vot/sparsecube_1.vot	Thu Apr 26 22:13:31 2018	(r4935)
@@ -5,9 +5,6 @@
       <GROUP ID="_010712XxjJ6d2Yfk" name="TimeFrame">
         <DESCRIPTION>Time domain frame</DESCRIPTION>
         <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
-        <GROUP name="offset">
-          <PARAM name="mjdref" datatype="double" value="50814.0"/>
-        </GROUP>
         <GROUP name="refpos">
           <DESCRIPTION>Reference position for frame</DESCRIPTION>
         </GROUP>
@@ -331,6 +328,10 @@
             <GROUP name="TimeData">
               <GROUP name="coord">
                 <FIELDref ref="_col-time"/>
+                <GROUP name="time0">
+                  <PARAM name="mjdref" datatype="double" value="50814.0"/>
+                  <GROUP ref="_010712XxjJ6d2Yfk" name="REF_TimeFrame"/>
+                </GROUP>
                 <GROUP ref="_0201ge70cAi4MErU" name="REF_Time_Axis"/>
                 <GROUP ref="_010712XxjJ6d2Yfk" name="REF_TimeFrame"/>
               </GROUP>

Modified: trunk/projects/dm/Cube/examples/vot/sparsecube_1a.vot
==============================================================================
--- trunk/projects/dm/Cube/examples/vot/sparsecube_1a.vot	Thu Apr 26 22:04:23 2018	(r4934)
+++ trunk/projects/dm/Cube/examples/vot/sparsecube_1a.vot	Thu Apr 26 22:13:31 2018	(r4935)
@@ -30,13 +30,6 @@
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.timescale">
           <CONSTANT ref="_01071jiJzYdXI6UP" dmtype="coords:domain.time.TimeScale"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.time0">
-          <INSTANCE dmtype="coords:domain.time.MJD">
-            <ATTRIBUTE dmrole="coords:domain.time.MJD.date">
-              <CONSTANT ref="_0107wfAjt4qRFTI5" dmtype="ivoa:real"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.refPosition">
           <INSTANCE dmtype="coords:domain.space.StdRefLocation">
             <ATTRIBUTE dmrole="coords:domain.space.StdRefLocation.position">
@@ -521,9 +514,19 @@
                 <INSTANCE dmtype="meas:GenTimeMeasure">
                   <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
                     <INSTANCE dmtype="coords:domain.time.TimeOffset">
-                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                      <ATTRIBUTE dmrole="coords:domain.time.TimeOffset.time">
                         <COLUMN ref="_col-time" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
+                      <ATTRIBUTE dmrole="coords:domain.time.TimeOffset.time0">
+                        <INSTANCE dmtype="coords:domain.time.MJD">
+                          <ATTRIBUTE dmrole="coords:domain.time.MJD.date">
+                            <CONSTANT ref="_0109wfAjt4qRFTI5" dmtype="ivoa:real"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:Coordinate.frame">
+                            <IDREF>_010712XxjJ6d2Yfk</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                      </ATTRIBUTE>
                       <REFERENCE dmrole="coords:CoordValue.axis">
                         <IDREF>_0201ge70cAi4MErU</IDREF>
                       </REFERENCE>
@@ -699,7 +702,6 @@
     <TABLE ID="_table1">
       <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
       <PARAM ID="_01071jiJzYdXI6UP" name="timescale" datatype="char" arraysize="2" value="TT"/>
-      <PARAM ID="_0107wfAjt4qRFTI5" name="mjdref" datatype="double" value="50814.0"/>
       <PARAM ID="_01061jiJzYdXI6UP" name="refframe" datatype="char" arraysize="4" value="ICRS"/>
       <PARAM ID="_0202jbaLEde93ssf" name="pha_domainMin" datatype="double" value="0" unit="adu"/>
       <PARAM ID="_0202o6A8iklnaxZm" name="pha_domainMax" datatype="double" value="36855" unit="adu"/>
@@ -834,6 +836,7 @@
       <PARAM ID="_ElSOA0YK3fVcaZen" name="scale" datatype="double" value="0.000136666666667">
         <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
       </PARAM>
+      <PARAM ID="_0109wfAjt4qRFTI5" name="mjdref" datatype="double" value="50814.0"/>
       <!-- Data FIELDs -->
       <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
       <FIELD ID="_col-chipx" name="chipx" datatype="double" unit="pixel"/>

Modified: trunk/projects/dm/Cube/examples/vot/sparsecube_1b.vot
==============================================================================
--- trunk/projects/dm/Cube/examples/vot/sparsecube_1b.vot	Thu Apr 26 22:04:23 2018	(r4934)
+++ trunk/projects/dm/Cube/examples/vot/sparsecube_1b.vot	Thu Apr 26 22:13:31 2018	(r4935)
@@ -30,13 +30,6 @@
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.timescale">
           <LITERAL dmtype="coords:domain.time.TimeScale" value="TT"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.time0">
-          <INSTANCE dmtype="coords:domain.time.MJD">
-            <ATTRIBUTE dmrole="coords:domain.time.MJD.date">
-              <LITERAL dmtype="ivoa:real" value="50814.0"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.refPosition">
           <INSTANCE dmtype="coords:domain.space.StdRefLocation">
             <ATTRIBUTE dmrole="coords:domain.space.StdRefLocation.position">
@@ -521,9 +514,19 @@
                 <INSTANCE dmtype="meas:GenTimeMeasure">
                   <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
                     <INSTANCE dmtype="coords:domain.time.TimeOffset">
-                      <ATTRIBUTE dmrole="coords:PhysicalCoordValue.cval">
+                      <ATTRIBUTE dmrole="coords:domain.time.TimeOffset.time">
                         <COLUMN ref="_col-time" dmtype="ivoa:RealQuantity"/>
                       </ATTRIBUTE>
+                      <ATTRIBUTE dmrole="coords:domain.time.TimeOffset.time0">
+                        <INSTANCE dmtype="coords:domain.time.MJD">
+                          <ATTRIBUTE dmrole="coords:domain.time.MJD.date">
+                            <LITERAL dmtype="ivoa:real" value="50814.0"/>
+                          </ATTRIBUTE>
+                          <REFERENCE dmrole="coords:Coordinate.frame">
+                            <IDREF>_010712XxjJ6d2Yfk</IDREF>
+                          </REFERENCE>
+                        </INSTANCE>
+                      </ATTRIBUTE>
                       <REFERENCE dmrole="coords:CoordValue.axis">
                         <IDREF>_0201ge70cAi4MErU</IDREF>
                       </REFERENCE>
@@ -699,7 +702,6 @@
     <TABLE ID="_table1">
       <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
       <PARAM name="timescale" datatype="char" arraysize="2" value="TT"/>
-      <PARAM name="mjdref" datatype="double" value="50814.0"/>
       <PARAM name="refframe" datatype="char" arraysize="4" value="ICRS"/>
       <PARAM name="pha_domainMin" datatype="double" value="0" unit="adu"/>
       <PARAM name="pha_domainMax" datatype="double" value="36855" unit="adu"/>
@@ -834,6 +836,7 @@
       <PARAM name="scale" datatype="double" value="0.000136666666667">
         <DESCRIPTION>WCS Projection scale factor (cdelt)</DESCRIPTION>
       </PARAM>
+      <PARAM name="mjdref" datatype="double" value="50814.0"/>
       <!-- Data FIELDs -->
       <FIELD ID="_col-time" name="time" datatype="double" unit="s"/>
       <FIELD ID="_col-chipx" name="chipx" datatype="double" unit="pixel"/>

Modified: trunk/projects/dm/STC/examples/vot/time_mjd.vot
==============================================================================
--- trunk/projects/dm/STC/examples/vot/time_mjd.vot	Thu Apr 26 22:04:23 2018	(r4934)
+++ trunk/projects/dm/STC/examples/vot/time_mjd.vot	Thu Apr 26 22:13:31 2018	(r4935)
@@ -14,7 +14,7 @@
       <URL>https://volute.g-vo.org/svn/trunk/projects/dm/STC/vo-dml/STC_meas-v2.0.vo-dml.xml</URL>
     </MODEL>
     <GLOBALS ID="Std_Frames">
-      <INSTANCE ID="_MJD_FRAME" dmtype="coords:domain.time.TimeFrame">
+      <INSTANCE ID="_TIME_FRAME" dmtype="coords:domain.time.TimeFrame">
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.timescale">
           <LITERAL dmtype="coords:domain.time.TimeScale" value="TT"/>
         </ATTRIBUTE>
@@ -25,13 +25,6 @@
             </ATTRIBUTE>
           </INSTANCE>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.time0">
-          <INSTANCE dmtype="coords:domain.time.JD">
-            <ATTRIBUTE dmrole="coords:domain.time.JD.date">
-              <LITERAL dmtype="ivoa:real" unit="d" value="2400000.5"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
       </INSTANCE>
     </GLOBALS>
     <GLOBALS>
@@ -42,7 +35,7 @@
               <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:real"/>
             </ATTRIBUTE>
             <REFERENCE dmrole="coords:Coordinate.frame">
-              <IDREF>_MJD_FRAME</IDREF>
+              <IDREF>_TIME_FRAME</IDREF>
             </REFERENCE>
           </INSTANCE>
         </ATTRIBUTE>

Modified: trunk/projects/dm/STC/examples/vot/time_offset.vot
==============================================================================
--- trunk/projects/dm/STC/examples/vot/time_offset.vot	Thu Apr 26 22:04:23 2018	(r4934)
+++ trunk/projects/dm/STC/examples/vot/time_offset.vot	Thu Apr 26 22:13:31 2018	(r4935)
@@ -18,13 +18,6 @@
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.timescale">
           <LITERAL dmtype="coords:domain.time.TimeScale" value="TT"/>
         </ATTRIBUTE>
-        <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.time0">
-          <INSTANCE dmtype="coords:domain.time.MJD">
-            <ATTRIBUTE dmrole="coords:domain.time.MJD.date">
-              <CONSTANT ref="_0318HEAjt4qRFTI5" dmtype="ivoa:real"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </ATTRIBUTE>
         <ATTRIBUTE dmrole="coords:domain.time.TimeFrame.refPosition">
           <INSTANCE dmtype="coords:domain.space.StdRefLocation">
             <ATTRIBUTE dmrole="coords:domain.space.StdRefLocation.position">
@@ -33,33 +26,22 @@
           </INSTANCE>
         </ATTRIBUTE>
       </INSTANCE>
-      <INSTANCE dmtype="coords:CoordSpace">
-        <COMPOSITION dmrole="coords:CoordSpace.axis"> 
-          <INSTANCE ID="_1D_Time_Axis" dmtype="coords:PhysicalAxis">
-            <ATTRIBUTE dmrole="coords:Axis.name">
-              <LITERAL dmtype="ivoa:string" value="time"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coords:ContinuousAxis.domainMin">
-              <LITERAL dmtype="ivoa:RealQuantity" value="-Inf"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coords:ContinuousAxis.domainMax">
-              <LITERAL dmtype="ivoa:RealQuantity" value="+Inf"/>
-            </ATTRIBUTE>
-            <ATTRIBUTE dmrole="coords:ContinuousAxis.cyclic">
-              <LITERAL dmtype="ivoa:boolean" value="FALSE"/>
-            </ATTRIBUTE>
-          </INSTANCE>
-        </COMPOSITION> 
-      </INSTANCE>
       <INSTANCE dmtype="meas:StdTimeMeasure">
         <ATTRIBUTE dmrole="meas:CoordMeasure.coord">
           <INSTANCE dmtype="coords:domain.time.TimeOffset">
             <ATTRIBUTE dmrole="coords:domain.time.TimeOffset.time">
               <CONSTANT ref="_HhKAdKcKlhfiUsag" dmtype="ivoa:RealQuantity"/>
             </ATTRIBUTE>
-            <REFERENCE dmrole="coords:CoordValue.axis">
-              <IDREF>_1D_Time_Axis</IDREF>
-            </REFERENCE>
+            <ATTRIBUTE dmrole="coords:domain.time.TimeOffset.time0">
+              <INSTANCE dmtype="coords:domain.time.MJD">
+                <ATTRIBUTE dmrole="coords:domain.time.MJD.date">
+                  <CONSTANT ref="_0518HEAjt4qRFTI5" dmtype="ivoa:real"/>
+                </ATTRIBUTE>
+                <REFERENCE dmrole="coords:Coordinate.frame">
+                  <IDREF>_0317pYWsEJmSbhJP</IDREF>
+                </REFERENCE>
+              </INSTANCE>
+            </ATTRIBUTE>
             <REFERENCE dmrole="coords:Coordinate.frame">
               <IDREF>_0317pYWsEJmSbhJP</IDREF>
             </REFERENCE>
@@ -71,8 +53,8 @@
   <RESOURCE>
     <TABLE ID="_table1">
       <DESCRIPTION>With VO-DML annotation enabled, the TABLE content may be reduced to its simplest form or retain its "native" structure.  Here we have reduced the content to a flat set of PARAM  and FIELD elements."</DESCRIPTION>
-      <PARAM ID="_0318HEAjt4qRFTI5" name="mjdref" datatype="double" value="50814.02" unit="d"/>
       <PARAM ID="_HhKAdKcKlhfiUsag" name="tstart" datatype="double" value="84244214.7547" unit="s"/>
+      <PARAM ID="_0518HEAjt4qRFTI5" name="mjdref" datatype="double" value="50814.02" unit="d"/>
       <!-- Data FIELDs -->
       <DATA>
         <FITS extnum="1">


More information about the Volutecommits mailing list