diff --git a/Instrument/AMDA/MEX/IMA.xml b/Instrument/AMDA/MEX/IMA.xml
index 4217d36..de24122 100644
--- a/Instrument/AMDA/MEX/IMA.xml
+++ b/Instrument/AMDA/MEX/IMA.xml
@@ -5,11 +5,8 @@
<ResourceID>spase://CDPP/Instrument/AMDA/MEX/IMA</ResourceID>
<ResourceHeader>
<ResourceName>IMA</ResourceName>
- <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
-0.01 - 36 keV/q for the main ion components H+, H2+, He+, O+, and for the
-group of molecular ions with M/q ration between 20 and 80 amu/e. IMA has a 90 deg x 360 deg field
+ <ReleaseDate>2017-01-13T00:00:00Z</ReleaseDate>
+ <Description>The Ion Mass Analyzer (IMA) of the ASPERA-3 package flown on Mars Express provides ion measurements in the energy range 0.01 - 36 keV/q for the main ion components H+, H2+, He+, O+, and for the group of molecular ions with M/q ration between 20 and 80 amu/e. IMA has a 90 deg x 360 deg field
of view. Electrostatic sweeping performs elevation (+/- 45 deg) coverage.
The IMA sensor is a spherical electrostatic analyzer followed by a circular
magnetic separating section. A large diameter MCP with a discrete anode images
diff --git a/Instrument/AMDA/VEX/IMA.xml b/Instrument/AMDA/VEX/IMA.xml
index bb518c1..38895e7 100644
--- a/Instrument/AMDA/VEX/IMA.xml
+++ b/Instrument/AMDA/VEX/IMA.xml
@@ -8,7 +8,7 @@
<AlternateName>Ion Mass Analyzer</AlternateName><!-- shown in instrument tooltip in the AMDA tree -->
<ReleaseDate>2016-07-10T00:00:00Z</ReleaseDate><!--- current date -->
<Description>The Ion Mass Analyzer (IMA) of the ASPERA-4 package
-flown on Venus Express provides ion measurements in the energy range
+ flown on Venus Express provides ion measurements in the energy range
0.01 - 36 keV/q for the main ion components H+, H2+, He+, O+, and for the
group of molecular ions with M/q ration between 20 and 80 amu/e. IMA has a 90 deg x 360 deg field
of view. Electrostatic sweeping performs elevation (+/- 45 deg) coverage.
diff --git a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
index 43164e3..fbdc1c4 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
@@ -53,7 +53,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2014-01-06T00:00:00Z</StartDate>
- <StopDate>2017-02-16T00:59:59Z</StopDate>
+ <StopDate>2017-02-17T01:59:59Z</StopDate>
</TimeSpan>
<Cadence>PT60S</Cadence>
</TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
index 578fbff..00f3834 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
@@ -48,7 +48,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2014-01-06T00:00:00Z</StartDate>
- <StopDate>2017-02-16T00:59:59Z</StopDate>
+ <StopDate>2017-02-17T01:59:59Z</StopDate>
</TimeSpan>
<Cadence>PT60S</Cadence>
</TemporalDescription>
diff --git a/NumericalData/AMDA/Ephemerides/mars-orb-all.xml b/NumericalData/AMDA/Ephemerides/mars-orb-all.xml
index 093bd96..048b4c1 100644
--- a/NumericalData/AMDA/Ephemerides/mars-orb-all.xml
+++ b/NumericalData/AMDA/Ephemerides/mars-orb-all.xml
@@ -23,7 +23,7 @@
</AccessInformation>
<ProviderName>SPICE</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/Ephemerides</InstrumentID>
- <MeasurementType>Ephemeris</MeasurementType>
+ <MeasurementType>Ephemeris</MeasurementType>
<TemporalDescription>
<TimeSpan>
<StartDate>1970-01-01T00:00:05Z</StartDate>
@@ -31,6 +31,7 @@
</TimeSpan>
<Cadence>PT60M</Cadence>
</TemporalDescription>
+ <ObservedRegion>Mars</ObservedRegion>
<Parameter>
<Name>xyz_hee</Name>
<ParameterKey>xyz_mars_hee</ParameterKey>
diff --git a/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml b/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml
index 24c0919..15b6c0b 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>imaextra spectra</ResourceName>
+ <ResourceName>ima spectra</ResourceName>
<ReleaseDate>2017-01-01T09:41:00</ReleaseDate>
<Description>Mars Express (MEX) ASPERA-3 Ion Mass Analyzer (IMA) data (spectrograms)
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 b010783..cfdbf42 100644
--- a/NumericalData/AMDA/MEX/IMA/mex-ima-param.xml
+++ b/NumericalData/AMDA/MEX/IMA/mex-ima-param.xml
@@ -4,13 +4,17 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MEX/IMA/mex-ima-param</ResourceID>
<ResourceHeader>
- <ResourceName>imaextra moments</ResourceName>
+ <ResourceName>ima moments</ResourceName>
<ReleaseDate>2015-10-15T09:42:00</ReleaseDate>
<Description/>
<Contact>
- <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
+ <PersonID>spase://CDPP/Person/Andrei.Fedorov</PersonID>
<Role>GeneralContact</Role>
</Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+ <Role>TechnicalContact</Role>
+ </Contact>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -23,7 +27,7 @@
</AccessInformation>
<ProviderName>IRAP</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/MEX/IMA</InstrumentID>
- <MeasurementType>EnergeticParticles</MeasurementType>
+ <MeasurementType>ThermalPlasma</MeasurementType>
<TemporalDescription>
<TimeSpan>
<StartDate>2004-06-26T19:37:50Z</StartDate>
@@ -127,17 +131,17 @@
<Size>3</Size>
<Element>
<Name>vx</Name>
- <Index>0</Index>
+ <Index>1</Index>
<ParameterKey>mex_h_vel(0)</ParameterKey>
</Element>
<Element>
<Name>vy</Name>
- <Index>1</Index>
+ <Index>2</Index>
<ParameterKey>mex_h_vel(1)</ParameterKey>
</Element>
<Element>
<Name>vz</Name>
- <Index>2</Index>
+ <Index>3</Index>
<ParameterKey>mex_h_vel(2)</ParameterKey>
</Element>
</Structure>
@@ -146,6 +150,20 @@
<ParticleQuantity>Velocity</ParticleQuantity>
</Particle>
</Parameter>
+ <Parameter>
+ <Name>protons: |v|</Name>
+ <ParameterKey>mex_h_vtot</ParameterKey>
+ <Description>Proton bulk velocity</Description>
+ <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
+ <Units>km/s</Units>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Particle>
+ <ParticleType>Proton</ParticleType>
+ <ParticleQuantity>Velocity</ParticleQuantity>
+ </Particle>
+ </Parameter>
<Parameter>
<Name>heavy: v_mso</Name>
<ParameterKey>mex_o_vel</ParameterKey>
@@ -159,17 +177,17 @@
<Size>3</Size>
<Element>
<Name>vx</Name>
- <Index>0</Index>
+ <Index>1</Index>
<ParameterKey>mex_o_vel(0)</ParameterKey>
</Element>
<Element>
<Name>vy</Name>
- <Index>1</Index>
+ <Index>2</Index>
<ParameterKey>mex_o_vel(1)</ParameterKey>
</Element>
<Element>
<Name>vz</Name>
- <Index>2</Index>
+ <Index>3</Index>
<ParameterKey>mex_o_vel(2)</ParameterKey>
</Element>
</Structure>
@@ -179,6 +197,20 @@
</Particle>
</Parameter>
<Parameter>
+ <Name>heavy: |v|</Name>
+ <ParameterKey>mex_o_vtot</ParameterKey>
+ <Description>Heavy Ions bulk velocity</Description>
+ <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
+ <Units>km/s</Units>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Particle>
+ <ParticleType>Ion</ParticleType>
+ <ParticleQuantity>Velocity</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ <Parameter>
<Name>scan flag</Name>
<ParameterKey>mex_scan</ParameterKey>
<Description>Scan quality flag</Description>
diff --git a/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml b/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml
new file mode 100644
index 0000000..506fbf8
--- /dev/null
+++ b/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml
@@ -0,0 +1,82 @@
+<?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/MEX/IMA/mex-ima-sw</ResourceID>
+ <ResourceHeader>
+ <ResourceName>proton moments in SW</ResourceName>
+ <AlternateName>MEX IMA Solar Wind Proxy</AlternateName>
+ <ReleaseDate>2015-10-15T09:42:00</ReleaseDate>
+ <Description/>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Andrei.Fedorov</PersonID>
+ <Role>GeneralContact</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+ <Role>TechnicalContact</Role>
+ </Contact>
+ </ResourceHeader>
+ <AccessInformation>
+ <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+ <Availability>Online</Availability>
+ <AccessRights>Open</AccessRights>
+ <AccessURL>
+ <URL>http://amda.cdpp.eu</URL>
+ </AccessURL>
+ <Format>NetCDF</Format>
+ </AccessInformation>
+ <ProviderName>IRAP</ProviderName>
+ <InstrumentID>spase://CDPP/Instrument/AMDA/MEX/IMA</InstrumentID>
+ <MeasurementType>ThermalPlasma</MeasurementType>
+ <TemporalDescription>
+ <TimeSpan>
+ <StartDate>2004-06-26T19:37:50Z</StartDate>
+ <StopDate>2017-01-25T23:21:54Z</StopDate>
+ </TimeSpan>
+ <Cadence>PT192S</Cadence>
+ </TemporalDescription>
+ <ObservedRegion>Mars</ObservedRegion>
+ <Parameter>
+ <Name>moments quality</Name>
+ <ParameterKey>mex_flag_sw</ParameterKey>
+ <Description>Proton moment quality flag</Description>
+ <Ucd>meta.code.qual;phys.atmol.ionStage</Ucd>
+ <Units>0-1</Units>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Support>
+ <SupportQuantity>Other</SupportQuantity>
+ </Support>
+ </Parameter>
+ <Parameter>
+ <Name>density</Name>
+ <ParameterKey>mex_n_sw</ParameterKey>
+ <Description>Proton density</Description>
+ <Ucd>phys.density;phys.atmol.ionStage</Ucd>
+ <Units>cm-3</Units>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Particle>
+ <ParticleType>Proton</ParticleType>
+ <ParticleQuantity>NumberDensity</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ <Parameter>
+ <Name>|v|</Name>
+ <ParameterKey>mex_v_sw</ParameterKey>
+ <Description>Proton bulk velocity</Description>
+ <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
+ <Units>km/s</Units>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Particle>
+ <ParticleType>Proton</ParticleType>
+ <ParticleQuantity>Velocity</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ </NumericalData>
+</Spase>
--
libgit2 0.21.2