diff --git a/Instrument/AMDA/MESSENGER/FIPS.xml b/Instrument/AMDA/MESSENGER/FIPS.xml
index 6b47425..215722f 100644
--- a/Instrument/AMDA/MESSENGER/FIPS.xml
+++ b/Instrument/AMDA/MESSENGER/FIPS.xml
@@ -5,7 +5,7 @@
<ResourceID>spase://CDPP/Instrument/AMDA/MESSENGER/FIPS</ResourceID>
<ResourceHeader>
<ResourceName>FIPS</ResourceName>
- <AlternateName> </AlternateName>
+ <AlternateName>Fast Imaging Plasma Spectrometer</AlternateName>
<ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
<Description>A </Description>
<Contact>
diff --git a/Instrument/AMDA/Pioneer10/MAG.xml b/Instrument/AMDA/Pioneer10/MAG.xml
index dd51f2d..900642d 100644
--- a/Instrument/AMDA/Pioneer10/MAG.xml
+++ b/Instrument/AMDA/Pioneer10/MAG.xml
@@ -4,7 +4,7 @@
<Instrument>
<ResourceID>spase://CDPP/Instrument/AMDA/Pioneer10/MAG</ResourceID>
<ResourceHeader>
- <ResourceName>Magnetic Fields</ResourceName>
+ <ResourceName>MAG</ResourceName>
<ReleaseDate>2009-05-20T21:10:15Z</ReleaseDate>
<Description>The magnetometer on Pioneer 10 (also carried on Pioneer 11) is a triaxial helium magnetometer with seven dynamic ranges, from plus or minus 2.5 nT to plus or minus 10 gauss. The linearity was 0.1%, and the noise threshold was 0.01% rms for 0-1 Hz. The accuracy was 0.5% of full scale range. The experiment worked as planned until November 1975, when the spacecraft was at about 8 au. No further useful data were obtained. The experimenter has used RTN coordinates in his data analysis. In this system, R (or X) is radially outward from the sun, T (or Y) is parallel to the sun's equatorial plane and has its direction given by the cross product of the sun's spin vector into the radial direction (i.e., into R) and N (or Z) completes the right-handed orthogonal system (positive northward). A detailed instrument description may be found in Smith et al., IEEE Trans. On Magnetics, Mag-11, p. 962, July 1975. Some data also include the interplanetary region. This instrument failed in October 1975 and was turned off in June 1986.</Description>
<Contact>
diff --git a/Instrument/AMDA/Pioneer11/MAG1.xml b/Instrument/AMDA/Pioneer11/MAG1.xml
index d1e3182..40e7478 100644
--- a/Instrument/AMDA/Pioneer11/MAG1.xml
+++ b/Instrument/AMDA/Pioneer11/MAG1.xml
@@ -4,7 +4,7 @@
<Instrument>
<ResourceID>spase://CDPP/Instrument/AMDA/Pioneer11/MAG1</ResourceID>
<ResourceHeader>
- <ResourceName>Magnetic Fields</ResourceName>
+ <ResourceName>MAG</ResourceName>
<ReleaseDate>2009-05-20T21:10:01Z</ReleaseDate>
<Description>The magnetometer on Pioneer 11 was a triaxial helium magnetometer with seven dynamic ranges, from plus or minus 2.5 nT to plus or minus 1.0E-3 T. The linearity was 0.1% and the noise threshold was 0.01 nT rms for 0-1 Hz. The accuracy was 0.5% of full scale range. The experimenter used RTN coordinates in the data analysis. In this system, R (or X) is radially outward from the sun, T (or Y) was parallel to the sun's equatorial plane and had its direction given by the cross product of the sun's spin vector into the radial direction (i.e., into R), and N (or Z) completed the right-handed orthogonal system (positive northward). A detailed instrument description may be found in Smith et al., IEEE Trans. On Magnetics, v. M-11, p. 962, July 1975. Data include the interplanetary region.</Description>
<Contact>
diff --git a/NumericalData/AMDA/MESSENGER/FIPS/mes-fips-scan.xml b/NumericalData/AMDA/MESSENGER/FIPS/mes-fips-scan.xml
index c7cd97b..b8b5885 100644
--- a/NumericalData/AMDA/MESSENGER/FIPS/mes-fips-scan.xml
+++ b/NumericalData/AMDA/MESSENGER/FIPS/mes-fips-scan.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/MESSENGER/FIPS/mes-fips-scan</ResourceID>
<ResourceHeader>
- <ResourceName>Scan@PDS</ResourceName>
+ <ResourceName>scan</ResourceName>
<ReleaseDate>2015-10-16T14:08:29Z</ReleaseDate>
<Description>MESSENGER Fast Imaging Plasma Spectrometer (FIPS) data (spectrogram)</Description>
<Contact>
@@ -26,7 +26,7 @@
<TemporalDescription>
<TimeSpan>
<StartDate>2008-08-20T16:03:35Z</StartDate>
- <StopDate>2013-09-16T23:59:52Z</StopDate>
+ <StopDate>2014-09-17T23:57:41Z</StopDate>
</TimeSpan>
<Cadence>PT9S</Cadence>
</TemporalDescription>
diff --git a/NumericalData/AMDA/Pioneer10/MAG/p10-mag-full.xml b/NumericalData/AMDA/Pioneer10/MAG/p10-mag-full.xml
index 2f69f9e..a5aa234 100644
--- a/NumericalData/AMDA/Pioneer10/MAG/p10-mag-full.xml
+++ b/NumericalData/AMDA/Pioneer10/MAG/p10-mag-full.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/MAG/p10-mag-full</ResourceID>
<ResourceHeader>
- <ResourceName>Cruise@CDAWeb</ResourceName>
+ <ResourceName>cruise</ResourceName>
<ReleaseDate>2015-10-14T16:08:00Z</ReleaseDate>
<Description>Pioneer 10 Magnetometer observations during cruise phase
Obtained from CDAWeb</Description>
@@ -38,7 +38,7 @@
</TemporalDescription>
<ObservedRegion>Heliosphere</ObservedRegion>
<Parameter>
- <Name>Magnetic Field Vector</Name>
+ <Name>b_rtn</Name>
<ParameterKey>p10_b_full</ParameterKey>
<Description>Hourly averages of RTN components of fine time scale magnetic field vectors</Description>
<Ucd>phys.magField</Ucd>
@@ -55,19 +55,19 @@
<Size>3</Size>
<Description>R,T,N components</Description>
<Element>
- <Name>R component</Name>
+ <Name>br</Name>
<Qualifier>Component.I</Qualifier>
<Index>1</Index>
<ParameterKey>p10_b_full(0)</ParameterKey>
</Element>
<Element>
- <Name>T component</Name>
+ <Name>bt</Name>
<Qualifier>Component.J</Qualifier>
<Index>2</Index>
<ParameterKey>p10_b_full(1)</ParameterKey>
</Element>
<Element>
- <Name>N component</Name>
+ <Name>bn</Name>
<Qualifier>Component.K</Qualifier>
<Index>3</Index>
<ParameterKey>p10_b_full(2)</ParameterKey>
@@ -80,7 +80,7 @@
</Field>
</Parameter>
<Parameter>
- <Name>Magnetic Field Magnitude</Name>
+ <Name>|b|</Name>
<ParameterKey>p10_bmag_full</ParameterKey>
<Description>Hourly average of fine time scale magnetic field magnitudes</Description>
<Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/Pioneer10/MAG/p10-mag-juphr.xml b/NumericalData/AMDA/Pioneer10/MAG/p10-mag-juphr.xml
index f4a6da8..ce91825 100644
--- a/NumericalData/AMDA/Pioneer10/MAG/p10-mag-juphr.xml
+++ b/NumericalData/AMDA/Pioneer10/MAG/p10-mag-juphr.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/MAG/p10-mag-juphr</ResourceID>
<ResourceHeader>
- <ResourceName>Jupiter_HR_SYS3@PDS</ResourceName>
+ <ResourceName>high res</ResourceName>
<ReleaseDate>2015-10-15T16:08:30Z</ReleaseDate>
<Description>Pioneer 10 Magnetometer high-resolution observations at Jupiter
Obtained from NASA/PDS</Description>
@@ -15,16 +15,21 @@
<InformationURL>
<Name>Readme file at SPDF</Name>
<URL>ftp://spdf.gsfc.nasa.gov/pub/data/pioneer/pioneer10/merged/coho1hr_magplasma_ascii/p10mgd.txt</URL>
- </InformationURL>
- </ResourceHeader>
- <AccessInformation>
+ </InformationURL>
+ <Association>
+ <AssociationID>p10-mag-jup</AssociationID>
+ <AssociationType>PartOf</AssociationType>
+ <Note>flyby jupiter</Note>
+ </Association>
+ </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>
+ <Format>NetCDF</Format>
</AccessInformation>
<ProviderName>PDS</ProviderName>
<InstrumentID>spase://CDPP/Instrument/AMDA/Pioneer10/MAG</InstrumentID>
@@ -43,7 +48,7 @@
<ObservedRegion>Jupiter.Callisto</ObservedRegion>
<ObservedRegion>Jupiter.Ganymede</ObservedRegion>
<Parameter>
- <Name>Magnetic Field Vector</Name>
+ <Name>b_sys3</Name>
<ParameterKey>p10_b_juphr</ParameterKey>
<Description>Hourly averages of SYS3 components of fine time scale magnetic field vectors</Description>
<Ucd>phys.magField</Ucd>
@@ -54,19 +59,19 @@
<Structure>
<Size>3</Size>
<Element>
- <Name>R component</Name>
+ <Name>br</Name>
<Qualifier>Component.I</Qualifier>
<Index>1</Index>
<ParameterKey>p10_b_juphr(0)</ParameterKey>
</Element>
<Element>
- <Name>Theta component</Name>
+ <Name>btheta</Name>
<Qualifier>Component.J</Qualifier>
<Index>2</Index>
<ParameterKey>p10_b_juphr(1)</ParameterKey>
</Element>
<Element>
- <Name>phi component</Name>
+ <Name>bphi</Name>
<Qualifier>Component.K</Qualifier>
<Index>3</Index>
<ParameterKey>p10_b_juphr(2)</ParameterKey>
@@ -79,7 +84,7 @@
</Field>
</Parameter>
<Parameter>
- <Name>Magnetic Field Magnitude</Name>
+ <Name>|b|</Name>
<ParameterKey>p10_bmag_juphr</ParameterKey>
<Description>Hourly average of fine time scale magnetic field magnitudes</Description>
<Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/Pioneer10/MAG/p10-mag-jupsys3.xml b/NumericalData/AMDA/Pioneer10/MAG/p10-mag-jupsys3.xml
index faf90bc..6d0cb58 100644
--- a/NumericalData/AMDA/Pioneer10/MAG/p10-mag-jupsys3.xml
+++ b/NumericalData/AMDA/Pioneer10/MAG/p10-mag-jupsys3.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/MAG/p10-mag-jupsys3</ResourceID>
<ResourceHeader>
- <ResourceName>Jupiter_SYS3@PDS</ResourceName>
+ <ResourceName>60 sec</ResourceName>
<ReleaseDate>2015-10-15T16:07:00Z</ReleaseDate>
<Description>Pioneer 10 Magnetometer observations at Jupiter
Obtained from NASA/PDS</Description>
@@ -16,6 +16,11 @@
<Name>Readme file at SPDF</Name>
<URL>ftp://spdf.gsfc.nasa.gov/pub/data/pioneer/pioneer10/merged/coho1hr_magplasma_ascii/p10mgd.txt</URL>
</InformationURL>
+ <Association>
+ <AssociationID>p10-mag-jup</AssociationID>
+ <AssociationType>PartOf</AssociationType>
+ <Note>flyby jupiter</Note>
+ </Association>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -40,11 +45,10 @@
<Keyword>magnetic field</Keyword>
<Keyword>Solar wind</Keyword>
<Parameter>
- <Name>Magnetic Field Vector</Name>
+ <Name>b_sys3</Name>
<ParameterKey>p10_b_jupsys3</ParameterKey>
<Description>Hourly averages of SYS3 components of fine time scale magnetic field vectors</Description>
- <Ucd>phys.magField</Ucd>
- <Cadence>PT1H</Cadence>
+ <Ucd>phys.magField</Ucd>
<Units>nT</Units>
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
@@ -52,19 +56,19 @@
<Structure>
<Size>3</Size>
<Element>
- <Name>R component</Name>
+ <Name>br</Name>
<Qualifier>Component.I</Qualifier>
<Index>1</Index>
<ParameterKey>p10_b_jupsys3(0)</ParameterKey>
</Element>
<Element>
- <Name>Theta component</Name>
+ <Name>btheta</Name>
<Qualifier>Component.J</Qualifier>
<Index>2</Index>
<ParameterKey>p10_b_jupsys3(1)</ParameterKey>
</Element>
<Element>
- <Name>phi component</Name>
+ <Name>bphi</Name>
<Qualifier>Component.K</Qualifier>
<Index>3</Index>
<ParameterKey>p10_b_jupsys3(2)</ParameterKey>
@@ -77,11 +81,10 @@
</Field>
</Parameter>
<Parameter>
- <Name>Magnetic Field Magnitude</Name>
+ <Name>|b|</Name>
<ParameterKey>p10_bmag_jupsys3</ParameterKey>
<Description>Hourly average of fine time scale magnetic field magnitudes</Description>
- <Ucd>phys.magField</Ucd>
- <Cadence>PT1H</Cadence>
+ <Ucd>phys.magField</Ucd>
<Units>nT</Units>
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
diff --git a/NumericalData/AMDA/Pioneer11/MAG/p11-mag-full.xml b/NumericalData/AMDA/Pioneer11/MAG/p11-mag-full.xml
index 9f5e83c..42d79e4 100644
--- a/NumericalData/AMDA/Pioneer11/MAG/p11-mag-full.xml
+++ b/NumericalData/AMDA/Pioneer11/MAG/p11-mag-full.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/MAG/p11-mag-full</ResourceID>
<ResourceHeader>
- <ResourceName>Cruise@CDAWeb</ResourceName>
+ <ResourceName>cruise</ResourceName>
<ReleaseDate>2015-10-15T16:14:00Z</ReleaseDate>
<Description>Pioneer 11 Magnetometer observations during cruise phase
Obtained from CDAWeb</Description>
@@ -38,7 +38,7 @@
</TemporalDescription>
<ObservedRegion>Heliosphere</ObservedRegion>
<Parameter>
- <Name>Magnetic Field Vector</Name>
+ <Name>b_rtn</Name>
<ParameterKey>p11_b_full</ParameterKey>
<Description>Hourly averages of RTN components of fine time scale magnetic field vectors</Description>
<Ucd>phys.magField</Ucd>
@@ -55,19 +55,19 @@
<Size>3</Size>
<Description>R,T,N components</Description>
<Element>
- <Name>R component</Name>
+ <Name>br</Name>
<Qualifier>Component.I</Qualifier>
<Index>1</Index>
<ParameterKey>p11_b_full(0)</ParameterKey>
</Element>
<Element>
- <Name>T component</Name>
+ <Name>bt</Name>
<Qualifier>Component.J</Qualifier>
<Index>2</Index>
<ParameterKey>p11_b_full(1)</ParameterKey>
</Element>
<Element>
- <Name>N component</Name>
+ <Name>bn</Name>
<Qualifier>Component.K</Qualifier>
<Index>3</Index>
<ParameterKey>p11_b_full(2)</ParameterKey>
@@ -80,7 +80,7 @@
</Field>
</Parameter>
<Parameter>
- <Name>Magnetic Field Magnitude</Name>
+ <Name>|b|</Name>
<ParameterKey>p11_bmag_full</ParameterKey>
<Description>Hourly average of fine time scale magnetic field magnitudes</Description>
<Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/Pioneer11/MAG/p11-mag-juphr.xml b/NumericalData/AMDA/Pioneer11/MAG/p11-mag-juphr.xml
index db9a2b4..a037f19 100644
--- a/NumericalData/AMDA/Pioneer11/MAG/p11-mag-juphr.xml
+++ b/NumericalData/AMDA/Pioneer11/MAG/p11-mag-juphr.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/MAG/p11-mag-juphr</ResourceID>
<ResourceHeader>
- <ResourceName>Jupiter_HR_SYS3@PDS</ResourceName>
+ <ResourceName>high res</ResourceName>
<ReleaseDate>2015-10-15T16:20:30Z</ReleaseDate>
<Description>Pioneer 11 Magnetometer high-resolution observations at Jupiter
Obtained from NASA/PDS</Description>
@@ -16,6 +16,11 @@
<Name>Readme file at SPDF</Name>
<URL>ftp://spdf.gsfc.nasa.gov/pub/data/pioneer/pioneer11/merged/coho1hr_magplasma_ascii/p10mgd.txt</URL>
</InformationURL>
+ <Association>
+ <AssociationID>p11-mag-jup</AssociationID>
+ <AssociationType>PartOf</AssociationType>
+ <Note>flyby jupiter</Note>
+ </Association>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -39,7 +44,7 @@
</TemporalDescription>
<ObservedRegion>Jupiter</ObservedRegion>
<Parameter>
- <Name>Magnetic Field Vector</Name>
+ <Name>b_sys3</Name>
<ParameterKey>p11_b_juphr</ParameterKey>
<Description>Hourly averages of SYS3 components of fine time scale magnetic field vectors</Description>
<Ucd>phys.magField</Ucd>
@@ -50,19 +55,19 @@
<Structure>
<Size>3</Size>
<Element>
- <Name>R component</Name>
+ <Name>br</Name>
<Qualifier>Component.I</Qualifier>
<Index>1</Index>
<ParameterKey>p11_b_juphr(0)</ParameterKey>
</Element>
<Element>
- <Name>Theta component</Name>
+ <Name>btheta</Name>
<Qualifier>Component.J</Qualifier>
<Index>2</Index>
<ParameterKey>p11_b_juphr(1)</ParameterKey>
</Element>
<Element>
- <Name>phi component</Name>
+ <Name>bphi</Name>
<Qualifier>Component.K</Qualifier>
<Index>3</Index>
<ParameterKey>p11_b_juphr(2)</ParameterKey>
@@ -75,7 +80,7 @@
</Field>
</Parameter>
<Parameter>
- <Name>Magnetic Field Magnitude</Name>
+ <Name>|b|</Name>
<ParameterKey>p11_bmag_juphr</ParameterKey>
<Description>Hourly average of fine time scale magnetic field magnitudes</Description>
<Ucd>phys.magField</Ucd>
diff --git a/NumericalData/AMDA/Pioneer11/MAG/p11-mag-jupsys3.xml b/NumericalData/AMDA/Pioneer11/MAG/p11-mag-jupsys3.xml
index 5396058..b698d25 100644
--- a/NumericalData/AMDA/Pioneer11/MAG/p11-mag-jupsys3.xml
+++ b/NumericalData/AMDA/Pioneer11/MAG/p11-mag-jupsys3.xml
@@ -4,7 +4,7 @@
<NumericalData>
<ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/MAG/p11-mag-jupsys3</ResourceID>
<ResourceHeader>
- <ResourceName>Jupiter_SYS3@PDS</ResourceName>
+ <ResourceName>60 sec</ResourceName>
<ReleaseDate>2015-10-15T16:23:00Z</ReleaseDate>
<Description>Pioneer 11 Magnetometer observations at Jupiter
Obtained from NASA/PDS</Description>
@@ -15,7 +15,12 @@
<InformationURL>
<Name>Readme file at SPDF</Name>
<URL>ftp://spdf.gsfc.nasa.gov/pub/data/pioneer/pioneer11/merged/coho1hr_magplasma_ascii/p10mgd.txt</URL>
- </InformationURL>
+ </InformationURL>
+ <Association>
+ <AssociationID>p11-mag-jup</AssociationID>
+ <AssociationType>PartOf</AssociationType>
+ <Note>flyby jupiter</Note>
+ </Association>
</ResourceHeader>
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -38,11 +43,10 @@
</TemporalDescription>
<ObservedRegion>Jupiter</ObservedRegion>
<Parameter>
- <Name>Magnetic Field Vector</Name>
+ <Name>b_sys3</Name>
<ParameterKey>p11_b_jupsys3</ParameterKey>
<Description>Hourly averages of SYS3 components of fine time scale magnetic field vectors</Description>
- <Ucd>phys.magField</Ucd>
- <Cadence>PT1H</Cadence>
+ <Ucd>phys.magField</Ucd>
<Units>nT</Units>
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
@@ -50,19 +54,19 @@
<Structure>
<Size>3</Size>
<Element>
- <Name>R component</Name>
+ <Name>br</Name>
<Qualifier>Component.I</Qualifier>
<Index>1</Index>
<ParameterKey>p11_b_jupsys3(0)</ParameterKey>
</Element>
<Element>
- <Name>Theta component</Name>
+ <Name>btheta</Name>
<Qualifier>Component.J</Qualifier>
<Index>2</Index>
<ParameterKey>p11_b_jupsys3(1)</ParameterKey>
</Element>
<Element>
- <Name>phi component</Name>
+ <Name>bphi</Name>
<Qualifier>Component.K</Qualifier>
<Index>3</Index>
<ParameterKey>p11_b_jupsys3(2)</ParameterKey>
@@ -75,11 +79,10 @@
</Field>
</Parameter>
<Parameter>
- <Name>Magnetic Field Magnitude</Name>
+ <Name>|b|</Name>
<ParameterKey>p11_bmag_jupsys3</ParameterKey>
<Description>Hourly average of fine time scale magnetic field magnitudes</Description>
- <Ucd>phys.magField</Ucd>
- <Cadence>PT1H</Cadence>
+ <Ucd>phys.magField</Ucd>
<Units>nT</Units>
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
--
libgit2 0.21.2