From d9ee61984a1024152eef1d546187117629032cc3 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Mon, 11 Apr 2016 11:57:25 +0200
Subject: [PATCH] work
---
Instrument/AMDA/MEX/ELS.xml | 4 ++--
Instrument/AMDA/MEX/IMA.xml | 2 +-
Instrument/AMDA/VEX/ELS.xml | 2 +-
Instrument/AMDA/VEX/IMA.xml | 7 ++++---
NumericalData/AMDA/MEX/ELS/mex-els-all.xml | 2 +-
NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml | 2 +-
NumericalData/AMDA/MEX/IMA/mex-ima-param.xml | 12 ++++++------
NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml | 2 +-
8 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/Instrument/AMDA/MEX/ELS.xml b/Instrument/AMDA/MEX/ELS.xml
index cec68fb..7d62b07 100644
--- a/Instrument/AMDA/MEX/ELS.xml
+++ b/Instrument/AMDA/MEX/ELS.xml
@@ -16,8 +16,8 @@ analyzer in a very compact design.</Description>
<Role>PrincipalInvestigator</Role>
</Contact>
</ResourceHeader>
- <InstrumentType>RetardingPotentialAnalyser</InstrumentType>
- <InvestigationName>ASPERA3_ELS</InvestigationName>
+ <InstrumentType>Spectrometer</InstrumentType>
+ <InvestigationName>ASPERA3</InvestigationName>
<ObservatoryID>spase://CDPP/Observatory/AMDA/MEX</ObservatoryID>
</Instrument>
</Spase>
diff --git a/Instrument/AMDA/MEX/IMA.xml b/Instrument/AMDA/MEX/IMA.xml
index 1355de0..4217d36 100644
--- a/Instrument/AMDA/MEX/IMA.xml
+++ b/Instrument/AMDA/MEX/IMA.xml
@@ -20,7 +20,7 @@ the matrix azimuth x mass.</Description>
</Contact>
</ResourceHeader>
<InstrumentType>MassSpectrometer</InstrumentType>
- <InvestigationName>ASPERA3_IMA</InvestigationName>
+ <InvestigationName>ASPERA3</InvestigationName>
<ObservatoryID>spase://CDPP/Observatory/AMDA/MEX</ObservatoryID>
</Instrument>
</Spase>
diff --git a/Instrument/AMDA/VEX/ELS.xml b/Instrument/AMDA/VEX/ELS.xml
index 4441df3..accf202 100644
--- a/Instrument/AMDA/VEX/ELS.xml
+++ b/Instrument/AMDA/VEX/ELS.xml
@@ -22,7 +22,7 @@ analyzer in a very compact design.</Description>
</InformationURL>
</ResourceHeader>
<InstrumentType>Spectrometer</InstrumentType>
- <InvestigationName>ASPERA4_ELS</InvestigationName>
+ <InvestigationName>ASPERA4</InvestigationName>
<ObservatoryID>spase://CDPP/Observatory/AMDA/VEX</ObservatoryID>
</Instrument>
</Spase>
diff --git a/Instrument/AMDA/VEX/IMA.xml b/Instrument/AMDA/VEX/IMA.xml
index 6bfd110..70f6115 100644
--- a/Instrument/AMDA/VEX/IMA.xml
+++ b/Instrument/AMDA/VEX/IMA.xml
@@ -4,7 +4,8 @@
<Instrument>
<ResourceID>spase://CDPP/Instrument/AMDA/VEX/IMA</ResourceID>
<ResourceHeader>
- <ResourceName>Venus Express ASPERA-4 Ion Mass Analyzer</ResourceName>
+ <ResourceName>IMA</ResourceName>
+ <AlternateName>Ion Mass Analyzer</AlternateName>
<ReleaseDate>2012-06-13T00:00:00Z</ReleaseDate>
<Description>The Ion Mass Analyzer (IMA) of the ASPERA-4 package
flown on Venus Express provides ion measurements in the energy range
@@ -23,8 +24,8 @@ the matrix azimuth x mass.</Description>
<URL>ftp://psa.esac.esa.int/pub/mirror/VENUS-EXPRESS/ASPERA4/VEX-V-SW-ASPERA-2-ELS-V1.0/CATALOG/INST.CAT</URL>
</InformationURL>
</ResourceHeader>
- <InstrumentType>RetardingPotentialAnalyser</InstrumentType>
- <InvestigationName>ASPERA4_IMA</InvestigationName>
+ <InstrumentType>MassSpectrometer</InstrumentType>
+ <InvestigationName>ASPERA4</InvestigationName>
<ObservatoryID>spase://CDPP/Observatory/AMDA/VEX</ObservatoryID>
</Instrument>
</Spase>
diff --git a/NumericalData/AMDA/MEX/ELS/mex-els-all.xml b/NumericalData/AMDA/MEX/ELS/mex-els-all.xml
index 391d619..03483ad 100644
--- a/NumericalData/AMDA/MEX/ELS/mex-els-all.xml
+++ b/NumericalData/AMDA/MEX/ELS/mex-els-all.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MEX/ELS/mex-els-all</ResourceID>
<ResourceHeader>
- <ResourceName>Mars Express electron distribution functions</ResourceName>
+ <ResourceName>electron spectra</ResourceName>
<ReleaseDate>2015-10-15T09:46:00</ReleaseDate>
<Description>The data consist of fluxes of electrons at several tens (time-
variable number) of energy steps in the 0.01-20keV energy range, in 16 look directions.
diff --git a/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml b/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml
index 0a99ac4..c170a87 100644
--- a/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml
+++ b/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MEX/IMA/mex-ima-extra</ResourceID>
<ResourceHeader>
- <ResourceName>Spectra</ResourceName>
+ <ResourceName>imaextra spectra</ResourceName>
<ReleaseDate>2015-10-15T09:41:00</ReleaseDate>
<Description>Mars Express (MEX) ASPERA-3 Ion Mass Analyzer (IMA) data (spectrograms)
Preliminary data from Andrei Fedorov (IRAP)</Description>
diff --git a/NumericalData/AMDA/MEX/IMA/mex-ima-param.xml b/NumericalData/AMDA/MEX/IMA/mex-ima-param.xml
index b5de629..556a804 100644
--- a/NumericalData/AMDA/MEX/IMA/mex-ima-param.xml
+++ b/NumericalData/AMDA/MEX/IMA/mex-ima-param.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MEX/IMA/mex-ima-param</ResourceID>
<ResourceHeader>
- <ResourceName>Moments Full</ResourceName>
+ <ResourceName>imaextra moments</ResourceName>
<ReleaseDate>2015-10-15T09:42:00</ReleaseDate>
<Description/>
<Contact>
@@ -59,7 +59,7 @@
</Support>
</Parameter>
<Parameter>
- <Name>density_protons</Name>
+ <Name>density protons</Name>
<ParameterKey>mex_h_dens</ParameterKey>
<Description>Proton density</Description>
<Ucd>phys.density;phys.atmol.ionStage</Ucd>
@@ -87,7 +87,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>t_protons</Name>
+ <Name>temperature protons</Name>
<ParameterKey>mex_h_temp</ParameterKey>
<Description>Proton temperature</Description>
<Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
@@ -101,7 +101,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>t_heavy</Name>
+ <Name>temperature heavy</Name>
<ParameterKey>mex_o_temp</ParameterKey>
<Description>Heavy ion temperature</Description>
<Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
@@ -115,7 +115,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>v_mso_protons</Name>
+ <Name>v_mso protons</Name>
<ParameterKey>mex_h_vel</ParameterKey>
<Description>Proton bulk velocity components in MSO coordinates</Description>
<Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
@@ -147,7 +147,7 @@
</Particle>
</Parameter>
<Parameter>
- <Name>v_mso_heavy</Name>
+ <Name>v_mso heavy</Name>
<ParameterKey>mex_o_vel</ParameterKey>
<Description>Heavy ion bulk velocity components in MSO coordinates</Description>
<Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
diff --git a/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml b/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml
index 7789997..8728fca 100644
--- a/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml
+++ b/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/VEX/ASPERA4/IMA/vex-ima-extra</ResourceID>
<ResourceHeader>
- <ResourceName>Spectra</ResourceName>
+ <ResourceName>imaextra spectra</ResourceName>
<ReleaseDate>2015-10-13T17:00:00</ReleaseDate>
<Description>Venus Express (VEX) ASPERA-4 Ion Mass Analyzer (IMA) data (spectrogram)
Preliminary spectra obtained from Andrei Fedorov (IRAP)</Description>
--
libgit2 0.21.2