From 4fdc325b061e7839e2aebd327f0882c1a59bbd95 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Thu, 21 Jan 2016 12:44:57 +0100
Subject: [PATCH] work

---
 Instrument/AMDA/Geotail/Ephemeris.xml                               |   2 +-
 NumericalData/AMDA/Cluster/Cluster1/Ephemeris/c1-orb-predefined.xml | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 NumericalData/AMDA/Cluster/Cluster2/Ephemeris/c2-orb-predefined.xml | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 NumericalData/AMDA/Cluster/Cluster3/Ephemeris/c3-orb-predefined.xml | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 NumericalData/AMDA/Cluster/Cluster4/Ephemeris/c4-orb-predefined.xml | 135 ---------------------------------------------------------------------------------------------------------------------------------------
 NumericalData/AMDA/GEOTAIL/Ephemeris/gtl-orb-all.xml                |  18 +++++++++---------
 6 files changed, 10 insertions(+), 550 deletions(-)
 delete mode 100644 NumericalData/AMDA/Cluster/Cluster1/Ephemeris/c1-orb-predefined.xml
 delete mode 100644 NumericalData/AMDA/Cluster/Cluster2/Ephemeris/c2-orb-predefined.xml
 delete mode 100644 NumericalData/AMDA/Cluster/Cluster3/Ephemeris/c3-orb-predefined.xml
 delete mode 100644 NumericalData/AMDA/Cluster/Cluster4/Ephemeris/c4-orb-predefined.xml

diff --git a/Instrument/AMDA/Geotail/Ephemeris.xml b/Instrument/AMDA/Geotail/Ephemeris.xml
index 0ba9b03..50d4eff 100644
--- a/Instrument/AMDA/Geotail/Ephemeris.xml
+++ b/Instrument/AMDA/Geotail/Ephemeris.xml
@@ -4,7 +4,7 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/Geotail/Ephemeris</ResourceID>
     <ResourceHeader>
-      <ResourceName>Geotail Spacecraft Position</ResourceName>
+      <ResourceName>Ephemeris</ResourceName>
       <AlternateName>Geotail Position</AlternateName>
       <ReleaseDate>2009-05-20T21:10:15Z</ReleaseDate>
       <Description>Geotail spacecraft position in various coordinate systems</Description>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/Ephemeris/c1-orb-predefined.xml b/NumericalData/AMDA/Cluster/Cluster1/Ephemeris/c1-orb-predefined.xml
deleted file mode 100644
index b1a7c88..0000000
--- a/NumericalData/AMDA/Cluster/Cluster1/Ephemeris/c1-orb-predefined.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
-    <Version>2.2.6</Version>
-    <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/Cluster/Cluster1/Ephemeris/c1-orb-predefined</ResourceID>
-        <ResourceHeader>
-            <ResourceName>orbit predefined</ResourceName>
-            <ReleaseDate>2015-10-19T16:00:00</ReleaseDate>
-            <Description>Cluster-1 (FM5/Rumba) satellite position and magnetic field model information.</Description>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
-        </ResourceHeader>
-        <AccessInformation>
-            <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-            <Availability>Online</Availability>
-            <AccessRights>Open</AccessRights>
-            <AccessURL>
-                <Name>AMDA at CDPP</Name>
-                <URL>amda.cdpp.eu</URL>                
-            </AccessURL>
-            <Format>NetCDF</Format>
-        </AccessInformation>
-        <ProviderName>CDAWeb</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Rumba/Ephemeris</InstrumentID>
-        <MeasurementType>Ephemeris</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan>
-                <StartDate>1970-01-01T00:00:00Z</StartDate>
-                <StopDate>1970-01-01T00:00:00Z</StopDate>
-            </TimeSpan>
-            <Cadence>PT5M</Cadence>
-        </TemporalDescription>     
-        <Parameter>
-            <Name>xyz gse</Name>
-            <ParameterKey>c1_xyz_pre</ParameterKey>
-            <Description>Spacecraft position in GSE</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSE</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c1_xyz_pre(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c1_xyz_pre(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c1_xyz_pre(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-        <Parameter>
-            <Name>xyz gsm</Name>
-            <ParameterKey>c1_xyz_pre_gsm</ParameterKey>
-            <Description>Spacecraft position in GSM</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>km</Units>
-            <UnitsConversion>1e3&gt;m</UnitsConversion>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSM</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c1_xyz_pre_gsm(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c1_xyz_pre_gsm(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c1_xyz_pre_gsm(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>        
-        <Parameter>
-            <Name>r</Name>
-            <ParameterKey>c1_r_pre</ParameterKey>
-            <Description/>
-            <Ucd>pos.distance;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <ValidMin>0.0</ValidMin>
-            <FillValue>-1.0E31</FillValue>
-            <Support>
-                <Qualifier>Magnitude</Qualifier>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-    </NumericalData>
-</Spase>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/Ephemeris/c2-orb-predefined.xml b/NumericalData/AMDA/Cluster/Cluster2/Ephemeris/c2-orb-predefined.xml
deleted file mode 100644
index c081d41..0000000
--- a/NumericalData/AMDA/Cluster/Cluster2/Ephemeris/c2-orb-predefined.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
-    <Version>2.2.6</Version>
-    <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/Cluster/Cluster2/Ephemeris/c2-orb-predefined</ResourceID>
-        <ResourceHeader>
-            <ResourceName>orbit predefined</ResourceName>
-            <ReleaseDate>2015-10-19T15:00:00</ReleaseDate>
-            <Description>Cluster-1 (Salsa) satellite position and magnetic field model information.</Description>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
-        </ResourceHeader>
-        <AccessInformation>
-            <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-            <Availability>Online</Availability>
-            <AccessRights>Open</AccessRights>
-            <AccessURL>
-                <Name>AMDA at CDPP</Name>
-                <URL>amda.cdpp.eu</URL>                
-            </AccessURL>
-            <Format>NetCDF</Format>
-        </AccessInformation>
-        <ProviderName>CDAWeb</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Salsa/Ephemeris</InstrumentID>
-        <MeasurementType>Ephemeris</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan>
-                <StartDate>1970-01-01T00:00:00Z</StartDate>
-                <StopDate>1970-01-01T00:00:00Z</StopDate>
-            </TimeSpan>
-            <Cadence>PT5M</Cadence>
-        </TemporalDescription>     
-        <Parameter>
-            <Name>GSE position</Name>
-            <ParameterKey>c2_xyz_pre</ParameterKey>
-            <Description>Spacecraft position in GSE</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSE</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c2_xyz_pre(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c2_xyz_pre(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c2_xyz_pre(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-        <Parameter>
-            <Name>GSM position</Name>
-            <ParameterKey>c2_xyz_pre_gsm</ParameterKey>
-            <Description>Spacecraft position in GSM</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>km</Units>
-            <UnitsConversion>1e3&gt;m</UnitsConversion>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSM</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c2_xyz_pre_gsm(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c2_xyz_pre_gsm(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c2_xyz_pre_gsm(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>        
-        <Parameter>
-            <Name>R</Name>
-            <ParameterKey>c2_r_pre</ParameterKey>
-            <Description/>
-            <Ucd>pos.distance;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <ValidMin>0.0</ValidMin>
-            <FillValue>-1.0E31</FillValue>
-            <Support>
-                <Qualifier>Magnitude</Qualifier>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-    </NumericalData>
-</Spase>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/Ephemeris/c3-orb-predefined.xml b/NumericalData/AMDA/Cluster/Cluster3/Ephemeris/c3-orb-predefined.xml
deleted file mode 100644
index ca3b489..0000000
--- a/NumericalData/AMDA/Cluster/Cluster3/Ephemeris/c3-orb-predefined.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
-    <Version>2.2.6</Version>
-    <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/Cluster/Cluster3/Ephemeris/c3-orb-predefined</ResourceID>
-        <ResourceHeader>
-            <ResourceName>orbit predefined</ResourceName>
-            <ReleaseDate>2015-10-19T15:00:00</ReleaseDate>
-            <Description>Cluster-2 (FM7/Samba) satellite position and magnetic field model information.</Description>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
-        </ResourceHeader>
-        <AccessInformation>
-            <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-            <Availability>Online</Availability>
-            <AccessRights>Open</AccessRights>
-            <AccessURL>
-                <Name>AMDA at CDPP</Name>
-                <URL>amda.cdpp.eu</URL>                
-            </AccessURL>
-            <Format>NetCDF</Format>
-        </AccessInformation>
-        <ProviderName>CDAWeb</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Samba/Ephemeris</InstrumentID>
-        <MeasurementType>Ephemeris</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan>
-                <StartDate>1970-01-01T00:00:00Z</StartDate>
-                <StopDate>1970-01-01T00:00:00Z</StopDate>
-            </TimeSpan>
-            <Cadence>PT5M</Cadence>
-        </TemporalDescription>     
-        <Parameter>
-            <Name>GSE position</Name>
-            <ParameterKey>c3_xyz_pre</ParameterKey>
-            <Description>Spacecraft position in GSE</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSE</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c3_xyz_pre(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c3_xyz_pre(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c3_xyz_pre(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-        <Parameter>
-            <Name>GSM position</Name>
-            <ParameterKey>c3_xyz_pre_gsm</ParameterKey>
-            <Description>Spacecraft position in GSM</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>km</Units>
-            <UnitsConversion>1e3&gt;m</UnitsConversion>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSM</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c3_xyz_pre_gsm(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c3_xyz_pre_gsm(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c3_xyz_pre_gsm(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>        
-        <Parameter>
-            <Name>R</Name>
-            <ParameterKey>c3_r_pre</ParameterKey>
-            <Description/>
-            <Ucd>pos.distance;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <ValidMin>0.0</ValidMin>
-            <FillValue>-1.0E31</FillValue>
-            <Support>
-                <Qualifier>Magnitude</Qualifier>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-    </NumericalData>
-</Spase>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/Ephemeris/c4-orb-predefined.xml b/NumericalData/AMDA/Cluster/Cluster4/Ephemeris/c4-orb-predefined.xml
deleted file mode 100644
index 9c59d50..0000000
--- a/NumericalData/AMDA/Cluster/Cluster4/Ephemeris/c4-orb-predefined.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
-    <Version>2.2.6</Version>
-    <NumericalData>
-        <ResourceID>spase://CDPP/NumericalData/AMDA/Cluster/Cluster4/Ephemeris/c4-orb-predefined</ResourceID>
-        <ResourceHeader>
-            <ResourceName>orbit predefined</ResourceName>
-            <ReleaseDate>2015-10-16T16:00:00</ReleaseDate>
-            <Description>Cluster-2 (FM8/Tango) satellite position and magnetic field model information.</Description>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
-        </ResourceHeader>
-        <AccessInformation>
-            <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-            <Availability>Online</Availability>
-            <AccessRights>Open</AccessRights>
-            <AccessURL>
-                <Name>AMDA at CDPP</Name>
-                <URL>amda.cdpp.eu</URL>                
-            </AccessURL>
-            <Format>NetCDF</Format>
-        </AccessInformation>
-        <ProviderName>CDAWeb</ProviderName>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Tango/Ephemeris</InstrumentID>
-        <MeasurementType>Ephemeris</MeasurementType>
-        <TemporalDescription>
-            <TimeSpan>
-                <StartDate>1970-01-01T00:00:00Z</StartDate>
-                <StopDate>1970-01-01T00:00:00Z</StopDate>
-            </TimeSpan>
-            <Cadence>PT5M</Cadence>
-        </TemporalDescription>     
-        <Parameter>
-            <Name>GSE position</Name>
-            <ParameterKey>c4_xyz_pre</ParameterKey>
-            <Description>Spacecraft position in GSE</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSE</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c4_xyz_pre(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c4_xyz_pre(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c4_xyz_pre(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-        <Parameter>
-            <Name>GSM position</Name>
-            <ParameterKey>c4_xyz_pre_gsm</ParameterKey>
-            <Description>Spacecraft position in GSM</Description>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>km</Units>
-            <UnitsConversion>1e3&gt;m</UnitsConversion>
-            <CoordinateSystem>
-                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-                <CoordinateSystemName>GSM</CoordinateSystemName>
-            </CoordinateSystem>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <Structure>
-                <Size>3</Size>
-                <Element>
-                    <Name>x</Name>
-                    <Qualifier>Component.I</Qualifier>
-                    <Index>1</Index>
-                    <ParameterKey>c4_xyz_pre_gsm(0)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>y</Name>
-                    <Qualifier>Component.J</Qualifier>
-                    <Index>2</Index>
-                    <ParameterKey>c4_xyz_pre_gsm(1)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-                <Element>
-                    <Name>z</Name>
-                    <Qualifier>Component.K</Qualifier>
-                    <Index>3</Index>
-                    <ParameterKey>c4_xyz_pre_gsm(2)</ParameterKey>
-                    <FillValue>-1.0E31</FillValue>
-                </Element>
-            </Structure>
-            <Support>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter>        
-        <Parameter>
-            <Name>R</Name>
-            <ParameterKey>c4_r_pre</ParameterKey>
-            <Description/>
-            <Ucd>pos.earth;instr.obsty</Ucd>
-            <Units>Re</Units>
-            <RenderingHints>
-                <DisplayType>TimeSeries</DisplayType>
-            </RenderingHints>
-            <ValidMin>0.0</ValidMin>
-            <FillValue>-1.0E31</FillValue>
-            <Support>
-                <Qualifier>Magnitude</Qualifier>
-                <SupportQuantity>Positional</SupportQuantity>
-            </Support>
-        </Parameter> 
-    </NumericalData>
-</Spase>
diff --git a/NumericalData/AMDA/GEOTAIL/Ephemeris/gtl-orb-all.xml b/NumericalData/AMDA/GEOTAIL/Ephemeris/gtl-orb-all.xml
index d6002b2..6173aa2 100644
--- a/NumericalData/AMDA/GEOTAIL/Ephemeris/gtl-orb-all.xml
+++ b/NumericalData/AMDA/GEOTAIL/Ephemeris/gtl-orb-all.xml
@@ -4,7 +4,7 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Geotail/Ephemeris/gtl-orb-all</ResourceID>
         <ResourceHeader>
-            <ResourceName>Geotail Spacecraft Definitive Positions</ResourceName>
+            <ResourceName>orbit</ResourceName>
             <ReleaseDate>2015-10-16T17:16:33Z</ReleaseDate>
             <Description>Definitive Geotail spacecraft positions in various coordinate systems</Description>
             <Contact>
@@ -38,7 +38,7 @@
             <Cadence>PT10M</Cadence>
         </TemporalDescription>
         <Parameter>
-            <Name>GSE Cartesian Position</Name>
+            <Name>xyz_gse</Name>
             <ParameterKey>gtl_xyz</ParameterKey>
             <Description>Spacecraft position vector in GSE coordinates</Description>
             <Ucd>pos.earth;instr.obsty</Ucd>
@@ -53,21 +53,21 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>X GSE</Name>
+                    <Name>x</Name>
                     <Qualifier>Component.I</Qualifier>
                     <Index>1</Index>
                     <ParameterKey>gtl_xyz(0)</ParameterKey>
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>Y GSE</Name>
+                    <Name>y</Name>
                     <Qualifier>Component.J</Qualifier>
                     <Index>2</Index>
                     <ParameterKey>gtl_xyz(1)</ParameterKey>
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>Z GSE</Name>
+                    <Name>z</Name>
                     <Qualifier>Component.K</Qualifier>
                     <Index>3</Index>
                     <ParameterKey>gtl_xyz(2)</ParameterKey>
@@ -79,7 +79,7 @@
             </Support>
         </Parameter>
         <Parameter>
-            <Name>GSM Cartesian Position</Name>
+            <Name>xyz_gsm</Name>
             <ParameterKey>gtl_xyz_gsm</ParameterKey>
             <Description>Spacecraft position vector in GSM coordinates</Description>
             <Ucd>pos.earth;instr.obsty</Ucd>
@@ -94,21 +94,21 @@
             <Structure>
                 <Size>3</Size>
                 <Element>
-                    <Name>X GSM</Name>
+                    <Name>x</Name>
                     <Qualifier>Component.I</Qualifier>
                     <Index>1</Index>
                     <ParameterKey>gtl_xyz_gsm(0)</ParameterKey>
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>Y GSM</Name>
+                    <Name>y</Name>
                     <Qualifier>Component.J</Qualifier>
                     <Index>2</Index>
                     <ParameterKey>gtl_xyz_gsm(1)</ParameterKey>
                     <FillValue>-1.0E31</FillValue>
                 </Element>
                 <Element>
-                    <Name>Z GSM</Name>
+                    <Name>z</Name>
                     <Qualifier>Component.K</Qualifier>
                     <Index>3</Index>
                     <ParameterKey>gtl_xyz_gsm(2)</ParameterKey>
--
libgit2 0.21.2