From 869b4a24698ca0fe14de4b728e5248c74a5b324f Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Tue, 14 Mar 2017 18:55:55 +0100
Subject: [PATCH] ICE, IES ion
---
NumericalData/AMDA/Rosetta/IES/ros-elc-az.xml | 2 +-
NumericalData/AMDA/Rosetta/IES/ros-elc-elv.xml | 2 +-
NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml | 2 +-
NumericalData/AMDA/Rosetta/IES/ros-ion-az.xml | 79 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
NumericalData/AMDA/Rosetta/IES/ros-ion-elv.xml | 79 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
NumericalData/AMDA/Rosetta/IES/ros-ion-en.xml | 79 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml | 3 ++-
NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml | 2 +-
NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml | 2 +-
Observatory/AMDA/ICE.xml | 9 +++++++--
Person/.xml | 12 ++++++++++++
Person/Brad.Trantham.xml | 11 +++++++++++
12 files changed, 184 insertions(+), 98 deletions(-)
create mode 100644 Person/.xml
create mode 100644 Person/Brad.Trantham.xml
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-elc-az.xml b/NumericalData/AMDA/Rosetta/IES/ros-elc-az.xml
index bb4efc9..5f21d4b 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-elc-az.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-elc-az.xml
@@ -42,7 +42,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2010-11-29T23:18:19Z</StartDate>
- <StopDate>2016-02-02T23:56:45Z</StopDate>
+ <StopDate>2016-09-30T23:58:44Z</StopDate>
</TimeSpan>
<Cadence>32s</Cadence></TemporalDescription>
<ObservedRegion/>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-elc-elv.xml b/NumericalData/AMDA/Rosetta/IES/ros-elc-elv.xml
index 0d31385..bef146f 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-elc-elv.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-elc-elv.xml
@@ -42,7 +42,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2010-11-29T23:18:19Z</StartDate>
- <StopDate>2016-02-02T23:56:45Z</StopDate>
+ <StopDate>2016-09-30T23:58:44Z</StopDate>
</TimeSpan>
<Cadence>32s</Cadence></TemporalDescription>
<ObservedRegion/>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml b/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
index 98c9def..7070aaf 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
@@ -37,7 +37,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2010-11-29T23:18:19Z</StartDate>
- <StopDate>2016-02-02T23:56:45Z</StopDate>
+ <StopDate>2016-09-30T23:58:44Z</StopDate>
</TimeSpan>
<Cadence>PT32S</Cadence>
</TemporalDescription>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-ion-az.xml b/NumericalData/AMDA/Rosetta/IES/ros-ion-az.xml
index 2f21e47..0c91aeb 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-ion-az.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-ion-az.xml
@@ -4,23 +4,27 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Rosetta/IES/ros-ion-az</ResourceID>
<ResourceHeader>
- <ResourceName>Ion azimuthal spectra</ResourceName>
- <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
- <Description>
- </Description>
- <Acknowledgement>
- </Acknowledgement>
- <Contact>
- <PersonID>James Burch</PersonID>
- <Role/>
+ <ResourceName>ion azimuthal spectra</ResourceName>
+ <ReleaseDate>2017-03-12T10:48:29Z</ReleaseDate>
+ <Description>Ion azimuthal spectra summed over energies and elevations</Description>
+ <Acknowledgement/>
+ <Contact>
+ <PersonID>spase://CDPP/Person/James.L.Burch</PersonID>
+ <Role>PrincipalInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Ray.Goldstein</PersonID>
+ <Role>CoInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Brad.Trantham</PersonID>
+ <Role>DataProducer</Role>
</Contact>
<InformationURL>
- <Name/>
- <URL>
- </URL>
- <Description>
- </Description>
- </InformationURL>
+ <Name/>
+ <URL/>
+ <Description/>
+ </InformationURL>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -28,25 +32,40 @@
<AccessRights>Open</AccessRights>
<AccessURL>
<Name>AMDA at CDPP</Name>
- <URL>
- http://amda.cdpp.eu
- </URL>
+ <URL>http://amda.cdpp.eu</URL>
</AccessURL>
- <Format/>
- <Acknowledgement>
- </Acknowledgement>
+ <Format>NetCDF</Format>
+ <Acknowledgement/>
</AccessInformation>
- <ProviderName/>
+ <ProviderName>SwRI / ImperialCollege</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/Rosetta/IES</InstrumentID>
- <MeasurementType/>
+ <MeasurementType>ThermalPlasma</MeasurementType>
<TemporalDescription>
<TimeSpan>
- <StartDate>2010-11-29T23:18:19Z</StartDate>
- <StopDate>2015-12-15T23:58:52Z</StopDate>
+ <StartDate>2010-11-29T23:18:19Z</StartDate>
+ <StopDate>2016-09-30T23:58:44Z</StopDate>
</TimeSpan>
- <Cadence>32s</Cadence></TemporalDescription>
- <ObservedRegion/>
- <Caveats>
- </Caveats>
-<Parameter><Name>counts</Name><ParameterKey>ros_ion_az</ParameterKey><Description/><Ucd/><Units>counts</Units><UnitsConversion/><Structure><Size>16</Size></Structure></Parameter></NumericalData>
+ <Cadence>PT128S</Cadence>
+ </TemporalDescription>
+ <ObservedRegion>Comet</ObservedRegion>
+ <Caveats/>
+ <Parameter>
+ <Name>counts</Name>
+ <ParameterKey>ros_ion_az</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>counts</Units>
+ <UnitsConversion/>
+ <RenderingHints>
+ <DisplayType>Spectrogram</DisplayType>
+ </RenderingHints>
+ <Structure>
+ <Size>16</Size>
+ </Structure>
+ <Particle>
+ <ParticleType>Ion</ParticleType>
+ <ParticleQuantity>Counts</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ </NumericalData>
</Spase>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-ion-elv.xml b/NumericalData/AMDA/Rosetta/IES/ros-ion-elv.xml
index d1241c7..301ae44 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-ion-elv.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-ion-elv.xml
@@ -4,23 +4,27 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Rosetta/IES/ros-ion-elv</ResourceID>
<ResourceHeader>
- <ResourceName>Ion elevation spectra</ResourceName>
- <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
- <Description>
- </Description>
- <Acknowledgement>
- </Acknowledgement>
- <Contact>
- <PersonID>James Burch</PersonID>
- <Role/>
+ <ResourceName>ion elevation spectra</ResourceName>
+ <ReleaseDate>2017-03-12T10:48:29Z</ReleaseDate>
+ <Description>Ion elevation spectra summed over energies and azimuths</Description>
+ <Acknowledgement/>
+ <Contact>
+ <PersonID>spase://CDPP/Person/James.L.Burch</PersonID>
+ <Role>PrincipalInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Ray.Goldstein</PersonID>
+ <Role>CoInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Brad.Trantham</PersonID>
+ <Role>DataProducer</Role>
</Contact>
<InformationURL>
- <Name/>
- <URL>
- </URL>
- <Description>
- </Description>
- </InformationURL>
+ <Name/>
+ <URL/>
+ <Description/>
+ </InformationURL>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -28,25 +32,40 @@
<AccessRights>Open</AccessRights>
<AccessURL>
<Name>AMDA at CDPP</Name>
- <URL>
- http://amda.cdpp.eu
- </URL>
+ <URL>http://amda.cdpp.eu</URL>
</AccessURL>
- <Format/>
- <Acknowledgement>
- </Acknowledgement>
+ <Format>NetCDF</Format>
+ <Acknowledgement/>
</AccessInformation>
- <ProviderName/>
+ <ProviderName>SwRI / ImperialCollege</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/Rosetta/IES</InstrumentID>
- <MeasurementType/>
+ <MeasurementType>ThermalPlasma</MeasurementType>
<TemporalDescription>
<TimeSpan>
- <StartDate>2010-11-29T23:18:19Z</StartDate>
- <StopDate>2016-02-02T23:56:45Z</StopDate>
+ <StartDate>2010-11-29T23:18:19Z</StartDate>
+ <StopDate>2016-09-30T23:58:44Z</StopDate>
</TimeSpan>
- <Cadence>32s</Cadence></TemporalDescription>
- <ObservedRegion/>
- <Caveats>
- </Caveats>
-<Parameter><Name>counts</Name><ParameterKey>ros_ion_elv</ParameterKey><Description/><Ucd/><Units>counts</Units><UnitsConversion/><Structure><Size>16</Size></Structure></Parameter></NumericalData>
+ <Cadence>PT128S</Cadence>
+ </TemporalDescription>
+ <ObservedRegion>Comet</ObservedRegion>
+ <Caveats/>
+ <Parameter>
+ <Name>counts</Name>
+ <ParameterKey>ros_ion_elv</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>counts</Units>
+ <UnitsConversion/>
+ <RenderingHints>
+ <DisplayType>Spectrogram</DisplayType>
+ </RenderingHints>
+ <Structure>
+ <Size>16</Size>
+ </Structure>
+ <Particle>
+ <ParticleType>Ion</ParticleType>
+ <ParticleQuantity>Counts</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ </NumericalData>
</Spase>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-ion-en.xml b/NumericalData/AMDA/Rosetta/IES/ros-ion-en.xml
index ad8c12d..369ae8c 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-ion-en.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-ion-en.xml
@@ -4,23 +4,27 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Rosetta/IES/ros-ion-en</ResourceID>
<ResourceHeader>
- <ResourceName>Ion energy spectra</ResourceName>
- <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
- <Description>
- </Description>
- <Acknowledgement>
- </Acknowledgement>
- <Contact>
- <PersonID>James Burch</PersonID>
- <Role/>
+ <ResourceName>ion energy spectra</ResourceName>
+ <ReleaseDate>2017-03-12T10:48:29Z</ReleaseDate>
+ <Description>Ion energy spectra summed over azimuths and elavations</Description>
+ <Acknowledgement/>
+ <Contact>
+ <PersonID>spase://CDPP/Person/James.L.Burch</PersonID>
+ <Role>PrincipalInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Ray.Goldstein</PersonID>
+ <Role>CoInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CDPP/Person/Brad.Trantham</PersonID>
+ <Role>DataProducer</Role>
</Contact>
<InformationURL>
- <Name/>
- <URL>
- </URL>
- <Description>
- </Description>
- </InformationURL>
+ <Name/>
+ <URL/>
+ <Description/>
+ </InformationURL>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -28,25 +32,40 @@
<AccessRights>Open</AccessRights>
<AccessURL>
<Name>AMDA at CDPP</Name>
- <URL>
- http://amda.cdpp.eu
- </URL>
+ <URL>http://amda.cdpp.eu</URL>
</AccessURL>
- <Format/>
- <Acknowledgement>
- </Acknowledgement>
+ <Format>NetCDF</Format>
+ <Acknowledgement/>
</AccessInformation>
- <ProviderName/>
+ <ProviderName>SwRI / ImperialCollege</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/Rosetta/IES</InstrumentID>
- <MeasurementType/>
+ <MeasurementType>ThermalPlasma</MeasurementType>
<TemporalDescription>
<TimeSpan>
- <StartDate>2010-11-29T23:18:19Z</StartDate>
- <StopDate>2016-02-02T23:56:45Z</StopDate>
+ <StartDate>2010-11-29T23:18:19Z</StartDate>
+ <StopDate>2016-09-30T23:58:44Z</StopDate>
</TimeSpan>
- <Cadence>32s</Cadence></TemporalDescription>
- <ObservedRegion/>
- <Caveats>
- </Caveats>
-<Parameter><Name>counts</Name><ParameterKey>ros_ion_spec</ParameterKey><Description/><Ucd/><Units>counts</Units><UnitsConversion/><Structure><Size>124</Size></Structure></Parameter></NumericalData>
+ <Cadence>PT128S</Cadence>
+ </TemporalDescription>
+ <ObservedRegion>Comet</ObservedRegion>
+ <Caveats/>
+ <Parameter>
+ <Name>counts</Name>
+ <ParameterKey>ros_ion_spec</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>counts</Units>
+ <UnitsConversion/>
+ <RenderingHints>
+ <DisplayType>Spectrogram</DisplayType>
+ </RenderingHints>
+ <Structure>
+ <Size>124</Size>
+ </Structure>
+ <Particle>
+ <ParticleType>Ion</ParticleType>
+ <ParticleQuantity>Counts</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ </NumericalData>
</Spase>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
index a08ddcf..8c3ad00 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
@@ -46,6 +46,7 @@
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
</RenderingHints>
+ <FillValue>-1.0e+31</FillValue>
<Particle>
<ParticleType>Ion</ParticleType>
<ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -62,7 +63,7 @@
</CoordinateSystem>
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
- </RenderingHints>
+ </RenderingHints>
<Structure>
<Size>3</Size>
<Element>
diff --git a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
index 070c18b..56dd703 100644
--- a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
@@ -43,7 +43,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2017-01-06T00:00:00Z</StartDate>
- <StopDate>2017-03-13T00:00:00Z</StopDate>
+ <StopDate>2017-03-14T00:00:00Z</StopDate>
</TimeSpan>
<Cadence>PT1H</Cadence>
</TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
index eb218b7..928218e 100644
--- a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
@@ -43,7 +43,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2017-01-06T00:00:00Z</StartDate>
- <StopDate>2017-03-13T00:00:00Z</StopDate>
+ <StopDate>2017-03-14T00:00:00Z</StopDate>
</TimeSpan>
<Cadence>PT1H</Cadence>
</TemporalDescription>
diff --git a/Observatory/AMDA/ICE.xml b/Observatory/AMDA/ICE.xml
index 42a4734..b68f2f9 100644
--- a/Observatory/AMDA/ICE.xml
+++ b/Observatory/AMDA/ICE.xml
@@ -6,7 +6,7 @@
<ResourceHeader>
<ResourceName>ICE</ResourceName>
<AlternateName>International Cometary Explorer : Giacobini-Zinner Flyby</AlternateName>
- <ReleaseDate>2010-09-27T18:45:12Z</ReleaseDate>
+ <ReleaseDate>2017-03-27T18:45:12Z</ReleaseDate>
<Description>The International Cometary Explorer (ICE) spacecraft (designed and launched as the
International Sun/Earth Explorer 3 (ISEE-3) satellite), was launched August 12, 1978,
into a heliocentric orbit. It was one of three spacecraft, along with the mother/daughter pair
@@ -25,12 +25,17 @@ first time since 1987. However, later firings of the thrusters failed, apparentl
pressurant in the fuel tanks.[8][9] The project team will pursue an alternative plan to use the spacecraft to
"collect scientific data and send it back to Earth.</Description>
<Contact>
- <PersonID> </PersonID>
+ <PersonID>spase://SMWG/Person/Robert.W.Farquhar</PersonID>
<Role>ProjectScientist</Role>
</Contact>
</ResourceHeader>
<Location>
<ObservatoryRegion>Comet</ObservatoryRegion>
</Location>
+ <OperatingSpan>
+ <StartDate>1978-08-12T00:00:00</StartDate>
+ <Note>Depart from Earth: 1983-12-22T00:00:00</Note>
+ <Note>Encounter with Giacobini-Zinner : 1985-09-11T00:00:00</Note>
+ </OperatingSpan>
</Observatory>
</Spase>
diff --git a/Person/.xml b/Person/.xml
new file mode 100644
index 0000000..db398ac
--- /dev/null
+++ b/Person/.xml
@@ -0,0 +1,12 @@
+<?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://www.spase-group.org/data/schema/spase-2_2_3.xsd">
+<Version>2.2.3</Version>
+<Person>
+ <ResourceID>spase://CDPP/Person/Elena.Budnik</ResourceID>
+ <ReleaseDate>2014-07-11T00:00:00Z</ReleaseDate>
+ <PersonName>Elena Budnik</PersonName>
+ <OrganizationName>IRAP/Noveltis</OrganizationName>
+ <Email>elena.budnik@irap.omp.eu</Email>
+ <PhoneNumber>+33-561-556160</PhoneNumber>
+ </Person>
+</Spase>
diff --git a/Person/Brad.Trantham.xml b/Person/Brad.Trantham.xml
new file mode 100644
index 0000000..1d485fb
--- /dev/null
+++ b/Person/Brad.Trantham.xml
@@ -0,0 +1,11 @@
+<?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://www.spase-group.org/data/schema/spase-2_2_3.xsd">
+<Version>2.2.3</Version>
+<Person>
+ <ResourceID>spase://CDPP/Person/Brad.Trantham</ResourceID>
+ <ReleaseDate>2017-02-11T00:00:00Z</ReleaseDate>
+ <PersonName>Dr. Bradley Trantham</PersonName>
+ <OrganizationName>Southwest Research Institute, San Antonio</OrganizationName>
+ <Email>btrantham@swri.org</Email>
+ </Person>
+</Spase>
--
libgit2 0.21.2