From 2d77f79c7f2b2743e0f4753edc3545337e17601f Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Mon, 18 Jan 2016 11:47:23 +0100
Subject: [PATCH] work
---
NumericalData/AMDA/Cassini/CAPS/cass-caps-ionmo.xml | 18 +++++++++---------
NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml | 48 ++++++++++++++++++++++++------------------------
NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml | 36 ++++++++++++++++++------------------
3 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/NumericalData/AMDA/Cassini/CAPS/cass-caps-ionmo.xml b/NumericalData/AMDA/Cassini/CAPS/cass-caps-ionmo.xml
index ea4f2c3..b530996 100644
--- a/NumericalData/AMDA/Cassini/CAPS/cass-caps-ionmo.xml
+++ b/NumericalData/AMDA/Cassini/CAPS/cass-caps-ionmo.xml
@@ -37,7 +37,7 @@
</TemporalDescription>
<ObservedRegion>Saturn</ObservedRegion>
<Parameter>
- <Name>ion method flag</Name>
+ <Name>method flag</Name>
<ParameterKey>cass_caps_imethod</ParameterKey>
<Ucd>meta.code.error;stat.fit</Ucd>
<RenderingHints>
@@ -48,7 +48,7 @@
</Support>
</Parameter>
<Parameter>
- <Name>H+ density</Name>
+ <Name>density h+</Name>
<ParameterKey>cass_caps_n_p</ParameterKey>
<Ucd>phys.density;phys.atmol.ionStage</Ucd>
<Units>cm-3</Units>
@@ -61,7 +61,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>H+ temperature</Name>
+ <Name>temperature h+</Name>
<ParameterKey>cass_caps_t_p</ParameterKey>
<Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
<Units>eV</Units>
@@ -74,7 +74,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>He2+ density</Name>
+ <Name>density he2+</Name>
<ParameterKey>cass_caps_n_he</ParameterKey>
<Ucd>phys.density;phys.atmol.ionStage</Ucd>
<Units>cm-3</Units>
@@ -87,7 +87,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>He2+ temperature</Name>
+ <Name>temperature he2+</Name>
<ParameterKey>cass_caps_t_he</ParameterKey>
<Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
<Units>eV</Units>
@@ -100,7 +100,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>Water group density</Name>
+ <Name>density h2o group</Name>
<ParameterKey>cass_caps_w_n</ParameterKey>
<Ucd>phys.density;phys.atmol.ionStage</Ucd>
<Units>cm-3</Units>
@@ -113,7 +113,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>Water group temperature</Name>
+ <Name>temperature h2o group</Name>
<ParameterKey>cass_caps_w_t</ParameterKey>
<Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
<Units>eV</Units>
@@ -126,7 +126,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>speed (KRTP)</Name>
+ <Name>v_krtp</Name>
<ParameterKey>cass_caps_v_ion</ParameterKey>
<Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
<Units>km/s</Units>
@@ -157,7 +157,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>flow speed</Name>
+ <Name>v_bulk</Name>
<ParameterKey>cass_caps_vmag_ion</ParameterKey>
<Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
<Units>km/s</Units>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
index 1eb7be1..fa711a6 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise</ResourceID>
<ResourceHeader>
- <ResourceName>orbit</ResourceName>
+ <ResourceName>cruise</ResourceName>
<ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
<Description>
</Description>
@@ -32,11 +32,11 @@
http://amda.cdpp.eu
</URL>
</AccessURL>
- <Format/>
+ <Format>Text</Format>
<Acknowledgement>
</Acknowledgement>
</AccessInformation>
- <ProviderName/>
+ <ProviderName>SPICE/NAIF</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID>
<MeasurementType/>
<TemporalDescription>
@@ -44,14 +44,14 @@
<StartDate>2013-11-18T19:21:49Z</StartDate>
<StopDate>2014-09-21T22:21:49Z</StopDate>
</TimeSpan>
- <Cadence/>
+ <Cadence>PT1H</Cadence>
</TemporalDescription>
- <ObservedRegion/>
+ <ObservedRegion>Heliosphere</ObservedRegion>
<Caveats>
</Caveats>
<Parameter>
- <Name>xyz iausun</Name>
- <ParameterKey>maven_orb_iausun</ParameterKey>
+ <Name>xyz_iau_sun</Name>
+ <ParameterKey>mav_xyz_iausun</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -64,17 +64,17 @@
<Element>
<Name>x</Name>
<Index>0</Index>
- <ParameterKey>maven_orb_iausun(0)</ParameterKey>
+ <ParameterKey>mav_xyz_iausun(0)</ParameterKey>
</Element>
<Element>
<Name>y</Name>
<Index>1</Index>
- <ParameterKey>maven_orb_iausun(1)</ParameterKey>
+ <ParameterKey>mav_xyz_iausun(1)</ParameterKey>
</Element>
<Element>
<Name>z</Name>
<Index>2</Index>
- <ParameterKey>maven_orb_iausun(2)</ParameterKey>
+ <ParameterKey>mav_xyz_iausun(2)</ParameterKey>
</Element>
</Structure>
<ValidMin/>
@@ -82,8 +82,8 @@
<FillValue/>
</Parameter>
<Parameter>
- <Name>xyz hee</Name>
- <ParameterKey>maven_orb_hee</ParameterKey>
+ <Name>xyz_hee</Name>
+ <ParameterKey>mav_xyz_hee</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -96,17 +96,17 @@
<Element>
<Name>x</Name>
<Index>0</Index>
- <ParameterKey>maven_orb_hee(0)</ParameterKey>
+ <ParameterKey>mav_xyz_hee(0)</ParameterKey>
</Element>
<Element>
<Name>y</Name>
<Index>1</Index>
- <ParameterKey>maven_orb_hee(1)</ParameterKey>
+ <ParameterKey>mav_xyz_hee(1)</ParameterKey>
</Element>
<Element>
<Name>z</Name>
<Index>2</Index>
- <ParameterKey>maven_orb_hee(2)</ParameterKey>
+ <ParameterKey>mav_xyz_hee(2)</ParameterKey>
</Element>
</Structure>
<ValidMin/>
@@ -114,8 +114,8 @@
<FillValue/>
</Parameter>
<Parameter>
- <Name>xyz heeq</Name>
- <ParameterKey>maven_orb_heeq</ParameterKey>
+ <Name>xyz_heeq</Name>
+ <ParameterKey>mav_xyz_heeq</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -128,17 +128,17 @@
<Element>
<Name>x</Name>
<Index>0</Index>
- <ParameterKey>maven_orb_heeq(0)</ParameterKey>
+ <ParameterKey>mav_xyz_heeq(0)</ParameterKey>
</Element>
<Element>
<Name>y</Name>
<Index>1</Index>
- <ParameterKey>maven_orb_heeq(1)</ParameterKey>
+ <ParameterKey>mav_xyz_heeq(1)</ParameterKey>
</Element>
<Element>
<Name>z</Name>
<Index>2</Index>
- <ParameterKey>maven_orb_heeq(2)</ParameterKey>
+ <ParameterKey>mav_xyz_heeq(2)</ParameterKey>
</Element>
</Structure>
<ValidMin/>
@@ -146,8 +146,8 @@
<FillValue/>
</Parameter>
<Parameter>
- <Name>r_iau_sun</Name>
- <ParameterKey>maven_orb_r</ParameterKey>
+ <Name>distance maven-sun</Name>
+ <ParameterKey>mav_sun_r</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -158,7 +158,7 @@
</Parameter>
<Parameter>
<Name>lon_iau_sun</Name>
- <ParameterKey>maven_orb_lon_iausun</ParameterKey>
+ <ParameterKey>mav_lon_iausun</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -169,7 +169,7 @@
</Parameter>
<Parameter>
<Name>lat_iau_sun</Name>
- <ParameterKey>maven_orb_lat_iausun</ParameterKey>
+ <ParameterKey>mav_lat_iausun</ParameterKey>
<Description/>
<Ucd/>
<Units/>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
index 2bda395..016b584 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/mav-orb-marsobs</ResourceID>
<ResourceHeader>
- <ResourceName>orbit</ResourceName>
+ <ResourceName>orbit mars</ResourceName>
<ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
<Description>
</Description>
@@ -36,7 +36,7 @@
<Acknowledgement>
</Acknowledgement>
</AccessInformation>
- <ProviderName/>
+ <ProviderName>SPICE/NAIF</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID>
<MeasurementType/>
<TemporalDescription>
@@ -44,14 +44,14 @@
<StartDate>2014-06-01T00:00:00Z</StartDate>
<StopDate>2015-12-15T16:56:59Z</StopDate>
</TimeSpan>
- <Cadence/>
+ <Cadence>PT1M</Cadence>
</TemporalDescription>
- <ObservedRegion/>
+ <ObservedRegion>Mars</ObservedRegion>
<Caveats>
</Caveats>
<Parameter>
- <Name>xyz iaumars</Name>
- <ParameterKey>maven_orb_iaumars</ParameterKey>
+ <Name>xyz_iau_mars</Name>
+ <ParameterKey>mav_xyz_iaumars</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -64,17 +64,17 @@
<Element>
<Name>x</Name>
<Index>0</Index>
- <ParameterKey>maven_orb_iaumars(0)</ParameterKey>
+ <ParameterKey>mav_xyz_iaumars(0)</ParameterKey>
</Element>
<Element>
<Name>y</Name>
<Index>1</Index>
- <ParameterKey>maven_orb_iaumars(1)</ParameterKey>
+ <ParameterKey>mav_xyz_iaumars(1)</ParameterKey>
</Element>
<Element>
<Name>z</Name>
<Index>2</Index>
- <ParameterKey>maven_orb_iaumars(2)</ParameterKey>
+ <ParameterKey>mav_xyz_iaumars(2)</ParameterKey>
</Element>
</Structure>
<ValidMin/>
@@ -82,8 +82,8 @@
<FillValue/>
</Parameter>
<Parameter>
- <Name>xyz hee</Name>
- <ParameterKey>maven_marsobs_mso</ParameterKey>
+ <Name>xyz_mso</Name>
+ <ParameterKey>mav_xyz_mso</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -96,17 +96,17 @@
<Element>
<Name>x</Name>
<Index>0</Index>
- <ParameterKey>maven_marsobs_mso(0)</ParameterKey>
+ <ParameterKey>mav_xyz_mso(0)</ParameterKey>
</Element>
<Element>
<Name>y</Name>
<Index>1</Index>
- <ParameterKey>maven_marsobs_mso(1)</ParameterKey>
+ <ParameterKey>mav_xyz_mso(1)</ParameterKey>
</Element>
<Element>
<Name>z</Name>
<Index>2</Index>
- <ParameterKey>maven_marsobs_mso(2)</ParameterKey>
+ <ParameterKey>mav_xyz_mso(2)</ParameterKey>
</Element>
</Structure>
<ValidMin/>
@@ -114,8 +114,8 @@
<FillValue/>
</Parameter>
<Parameter>
- <Name>r_iau_mars</Name>
- <ParameterKey>maven_marsobs_r</ParameterKey>
+ <Name>distance maven-mars</Name>
+ <ParameterKey>mav_mars_r</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -126,7 +126,7 @@
</Parameter>
<Parameter>
<Name>lon_iau_mars</Name>
- <ParameterKey>maven_marsobs_lon_iaumars</ParameterKey>
+ <ParameterKey>mav_lon_iaumars</ParameterKey>
<Description/>
<Ucd/>
<Units/>
@@ -137,7 +137,7 @@
</Parameter>
<Parameter>
<Name>lat_iau_mars</Name>
- <ParameterKey>maven_marsobs_lat_iaumars</ParameterKey>
+ <ParameterKey>mav_lat_iaumars</ParameterKey>
<Description/>
<Ucd/>
<Units/>
--
libgit2 0.21.2