From 7134e4b6bb4da9626c6d270f84d06d3819df8301 Mon Sep 17 00:00:00 2001 From: Elena.Budnik <ebudnik@irap.omp.eu> Date: Thu, 28 Jan 2016 15:37:14 +0100 Subject: [PATCH] work --- Instrument/AMDA/Ulysses/Ephemeris.xml | 2 +- NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-all.xml | 62 +++++++++++++++++++++++++++++--------------------------------- NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-jup.xml | 8 ++++---- 3 files changed, 34 insertions(+), 38 deletions(-) diff --git a/Instrument/AMDA/Ulysses/Ephemeris.xml b/Instrument/AMDA/Ulysses/Ephemeris.xml index df87723..cabdaa8 100644 --- a/Instrument/AMDA/Ulysses/Ephemeris.xml +++ b/Instrument/AMDA/Ulysses/Ephemeris.xml @@ -4,7 +4,7 @@ <Instrument> <ResourceID>spase://CDPP/Instrument/AMDA/Ulysses/Ephemeris</ResourceID> <ResourceHeader> - <ResourceName>Ulysses Positions</ResourceName> + <ResourceName>Ephemeris</ResourceName> <AlternateName>Ulysses Ephemeris</AlternateName> <ReleaseDate>2009-05-20T21:10:12Z</ReleaseDate> <Description>Ulysses spacecraft positions</Description> diff --git a/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-all.xml b/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-all.xml index 0a6115b..c8ae0b0 100644 --- a/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-all.xml +++ b/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-all.xml @@ -4,7 +4,7 @@ <NumericalData> <ResourceID>spase://CDPP/NumericalData/AMDA/Ulysses/Ephemeris/ulys-orb-all</ResourceID> <ResourceHeader> - <ResourceName>Ulysses Spacecraft Positions</ResourceName> + <ResourceName>cruise</ResourceName> <ReleaseDate>2015-10-13T14:31:00Z</ReleaseDate> <Description>Ulysses spacecraft positions data product </Description> <Contact> @@ -31,8 +31,7 @@ </TimeSpan> <Cadence>PT1H</Cadence> </TemporalDescription> - <ObservedRegion>Heliosphere</ObservedRegion> - + <ObservedRegion>Heliosphere</ObservedRegion> <Parameter> <Name>xyz_hae</Name> <ParameterKey>xyz_ulys_hae</ParameterKey> @@ -44,17 +43,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hae</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_ulys_hae(0)</ParameterKey> </Element> <Element> - <Name>y_hae</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_ulys_hae(1)</ParameterKey> </Element> <Element> - <Name>z_hae</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_ulys_hae(2)</ParameterKey> </Element> @@ -64,31 +63,28 @@ </Support> </Parameter> <Parameter> - <Name>pol_heliographic</Name> - <ParameterKey>ulys_carr</ParameterKey> + <Name>distance ulys-sun</Name> + <ParameterKey>ulys_carr(0)</ParameterKey> <Ucd>pos.heliocentric</Ucd> - <Units>AU</Units> - <RenderingHints> - <DisplayType>TimeSeries</DisplayType> - </RenderingHints> - <Structure> - <Size>3</Size> - <Element> - <Name>r</Name> - <Index>0</Index> - <ParameterKey>ulys_carr(0)</ParameterKey> - </Element> - <Element> - <Name>lon</Name> - <Index>1</Index> - <ParameterKey>ulys_carr(1)</ParameterKey> - </Element> - <Element> - <Name>lat</Name> - <Index>2</Index> - <ParameterKey>ulys_carr(2)</ParameterKey> - </Element> - </Structure> + <Units>AU</Units> + <Support> + <SupportQuantity>Positional</SupportQuantity> + </Support> + </Parameter> + <Parameter> + <Name>lon iau_sun</Name> + <ParameterKey>ulys_carr(1)</ParameterKey> + <Ucd>pos.heliocentric</Ucd> + <Units>deg</Units> + <Support> + <SupportQuantity>Positional</SupportQuantity> + </Support> + </Parameter> + <Parameter> + <Name>lat iau_sun</Name> + <ParameterKey>ulys_carr(2)</ParameterKey> + <Ucd>pos.heliocentric</Ucd> + <Units>deg</Units> <Support> <SupportQuantity>Positional</SupportQuantity> </Support> @@ -104,17 +100,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hee</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_ulys_hee(0)</ParameterKey> </Element> <Element> - <Name>y_hee</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_ulys_hee(1)</ParameterKey> </Element> <Element> - <Name>z_hee</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_ulys_hee(2)</ParameterKey> </Element> diff --git a/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-jup.xml b/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-jup.xml index 45f7533..98507d3 100644 --- a/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-jup.xml +++ b/NumericalData/AMDA/ULYSSES/Ephemeris/ulys-orb-jup.xml @@ -4,7 +4,7 @@ <NumericalData> <ResourceID>spase://CDPP/NumericalData/AMDA/Ulysses/Ephemeris/ulys-orb-jup</ResourceID> <ResourceHeader> - <ResourceName>Ulysses Spacecraft Positions Jupiter_flyby</ResourceName> + <ResourceName>flyby jupiter</ResourceName> <ReleaseDate>2015-10-13T15:08:29Z</ReleaseDate> <Description>Ulysses spacecraft positions data product </Description> <Contact> @@ -34,7 +34,7 @@ </TemporalDescription> <ObservedRegion>Jupiter</ObservedRegion> <Parameter> - <Name>r</Name> + <Name>distance ulys-jup</Name> <ParameterKey>ulys_jup_r</ParameterKey> <Ucd>pos.distance;instr.obsty</Ucd> <Units>Rj</Units> @@ -55,7 +55,7 @@ </Support> </Parameter> <Parameter> - <Name>MLat</Name> + <Name>mlat</Name> <ParameterKey>ulys_jup_mlat</ParameterKey> <Ucd>pos.bodyrc.lat;phys.magField;instr.obsty</Ucd> <Units>deg</Units> @@ -67,7 +67,7 @@ </Support> </Parameter> <Parameter> - <Name>LT</Name> + <Name>local time</Name> <ParameterKey>ulys_jup_lt</ParameterKey> <Ucd>pos.bodyrc.long;instr.obsty</Ucd> <Units>HHMM</Units> -- libgit2 0.21.2