From eb3c4d86ae5aa681907f6d41b4d679bf500bcdb8 Mon Sep 17 00:00:00 2001
From: Quentin Brzustowski <quentin.brzustowski@irap.omp.eu>
Date: Mon, 20 Jan 2020 14:09:27 +0100
Subject: [PATCH] Added instrument Ephemeris for AMPTE CCE, UKS and IRM

---
 Instrument/CDPP-AMDA/CCE/Ephemeris.xml      |  27 +++++++++++++++++++++++++++
 Instrument/CDPP-AMDA/IRM/Ephemeris.xml      |  30 ++++++++++++++++++++++++++++++
 Instrument/CDPP-AMDA/UKS/Ephemeris.xml      |  31 +++++++++++++++++++++++++++++++
 NumericalData/CDPP-AMDA/IRM/irm-orb-all.xml | 137 -----------------------------------------------------------------------------------------------------------------------------------------
 NumericalData/CDPP-AMDA/UKS/uks-orb-all.xml | 138 ------------------------------------------------------------------------------------------------------------------------------------------
 Observatory/CDPP-AMDA/AMPTE/CCE.xml         |   2 +-
 Observatory/CDPP-AMDA/AMPTE/IRM.xml         |   2 +-
 Observatory/CDPP-AMDA/AMPTE/UKS.xml         |   2 +-
 8 files changed, 91 insertions(+), 278 deletions(-)
 create mode 100644 Instrument/CDPP-AMDA/CCE/Ephemeris.xml
 create mode 100644 Instrument/CDPP-AMDA/IRM/Ephemeris.xml
 create mode 100644 Instrument/CDPP-AMDA/UKS/Ephemeris.xml
 delete mode 100644 NumericalData/CDPP-AMDA/IRM/irm-orb-all.xml
 delete mode 100644 NumericalData/CDPP-AMDA/UKS/uks-orb-all.xml

diff --git a/Instrument/CDPP-AMDA/CCE/Ephemeris.xml b/Instrument/CDPP-AMDA/CCE/Ephemeris.xml
new file mode 100644
index 0000000..efe2dd1
--- /dev/null
+++ b/Instrument/CDPP-AMDA/CCE/Ephemeris.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
+  <Version>2.2.6</Version>
+  <Instrument>
+    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/CCE/Ephemeris</ResourceID>
+    <ResourceHeader>
+      <ResourceName>Ephemeris</ResourceName>
+      <AlternateName>CCE orbit</AlternateName>
+      <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
+      <Description>AMPTE/CCE spacecraft positions in various coordinate systems
+      </Description>
+      <Acknowledgement>User will acknowledge the AMPTE/CCE magnetometer team in any publication resulting from the use of these data.</Acknowledgement>
+      <Contact>
+        <PersonID>spase://SMWG/Person/Brian.J.Anderson</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <InformationURL>
+        <Name>AMPTE-CCE Magnetic Field Experiment Home Page</Name>
+        <URL>http://sd-www.jhuapl.edu/AMPTE/MAG/</URL>
+        <Description>MFE instrument information as well as spin-averaged-data</Description>
+      </InformationURL>
+    </ResourceHeader>
+    <InstrumentType>Platform</InstrumentType>
+    <InvestigationName>Spacecraft position</InvestigationName>
+    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/AMPTE/CCE</ObservatoryID>
+  </Instrument>
+</Spase>
diff --git a/Instrument/CDPP-AMDA/IRM/Ephemeris.xml b/Instrument/CDPP-AMDA/IRM/Ephemeris.xml
new file mode 100644
index 0000000..a088932
--- /dev/null
+++ b/Instrument/CDPP-AMDA/IRM/Ephemeris.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
+  <Version>2.2.6</Version>
+  <Instrument>
+    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/IRM/Ephemeris</ResourceID>
+    <ResourceHeader>
+      <ResourceName>Ephemeris</ResourceName>
+      <AlternateName>IRM orbit</AlternateName>
+      <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
+      <Description>AMPTE_IRM spacecraft positions in various coordinate systems
+      </Description>
+      <Contact>
+        <PersonID>spase://SMWG/Person/Hermann.Luehr</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <Contact>
+        <PersonID>spase://SMWG/Person/Robert.E.McGuire</PersonID>
+        <Role>MetadataContact</Role>
+      </Contact>
+      <InformationURL>
+        <Name>NSSDC Master Catalog</Name>
+        <URL>https://nssdc.gsfc.nasa.gov/nmc/experiment/display.action?id=1984-088B-02</URL>
+        <Description>Information about the AMPTE-IRM investigation</Description>
+      </InformationURL>
+    </ResourceHeader>
+    <InstrumentType>Platform</InstrumentType>
+    <InvestigationName>Spacecraft position</InvestigationName>
+    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/AMPTE/IRM</ObservatoryID>
+  </Instrument>
+</Spase>
diff --git a/Instrument/CDPP-AMDA/UKS/Ephemeris.xml b/Instrument/CDPP-AMDA/UKS/Ephemeris.xml
new file mode 100644
index 0000000..6107ea9
--- /dev/null
+++ b/Instrument/CDPP-AMDA/UKS/Ephemeris.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
+  <Version>2.2.6</Version>
+  <Instrument>
+    <ResourceID>spase://CNES/Instrument/CDPP-AMDA/UKS/Ephemeris</ResourceID>
+    <ResourceHeader>
+      <ResourceName>Ephemeris</ResourceName>
+      <AlternateName>UKS spacecraft position</AlternateName>
+      <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
+      <Description>
+        Spacecraft position in various coordinate systems
+      </Description>
+      <Contact>
+        <PersonID>spase://SMWG/Person/David.J.Southwood</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <Contact>
+        <PersonID>spase://SMWG/Person/Malcolm.W.Dunlop</PersonID>
+        <Role>DataProducer</Role>
+      </Contact>
+      <InformationURL>
+        <Name>NSSDC Master Catalog</Name>
+        <URL>https://nssdc.gsfc.nasa.gov/nmc/experiment/display.action?id=1984-088C-04</URL>
+        <Description>Information about the AMPTE-UKS magnetometer</Description>
+      </InformationURL>
+    </ResourceHeader>
+    <InstrumentType>Platform</InstrumentType>
+    <InvestigationName>Spacecraft position</InvestigationName>
+    <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/AMPTE/UKS</ObservatoryID>
+  </Instrument>
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/IRM/irm-orb-all.xml b/NumericalData/CDPP-AMDA/IRM/irm-orb-all.xml
deleted file mode 100644
index 1735109..0000000
--- a/NumericalData/CDPP-AMDA/IRM/irm-orb-all.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?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_3_0.xsd">
-   <Version>2.3.0</Version>
-   <NumericalData>
-      <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/UKS/MAG/irm-orb-all</ResourceID>
-      <ResourceHeader>
-          <ResourceName>Orbit</ResourceName>
-          <AlternateName>Ephemeris</AlternateName>      
-          <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
-         <Description>           
-         </Description>
-          <Acknowledgement>User will acknowledge the AMPTE/IRM magnetometer team in any publication resulting from the use of these data.
-         </Acknowledgement>
-      </ResourceHeader>
-      <AccessInformation>
-         <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
-         <Availability>Online</Availability>
-         <AccessRights>Open</AccessRights>
-         <AccessURL>
-            <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
-         </AccessURL>
-         <Format>Text</Format>
-         <Acknowledgement>
-                AMDA is a science analysis system provided by the Centre de Donnees de la 
-                Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and 
-                Universite Paul Sabatier, Toulouse
-         </Acknowledgement>
-      </AccessInformation>
-      <ProviderName></ProviderName> 
-       <ProviderResourceName></ProviderResourceName>
-      <ProviderAcknowlegment> </ProviderAcknowlegment>
-      <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/IRM/MAG</InstrumentID>
-      <MeasurementType>Ephemeris</MeasurementType>
-      <TemporalDescription>
-         <TimeSpan>
-             <StartDate>1984-08-25T07:31:00</StartDate>
-             <StopDate>1986-04-09T04:20:10</StopDate>
-         </TimeSpan>
-          <Cadence>PT5S</Cadence>
-      </TemporalDescription>
-       <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
-       <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
-       <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>   
-       <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
-      <Parameter>
-         <Name>pos_gse</Name>
-         <ParameterKey>irm_orb_xyz</ParameterKey>
-         <Description>
-             Spacecraft position in GSE Cartesian coordinates
-         </Description>
-         <Units>Re</Units>
-         <UnitsConversion>6.378e6;km</UnitsConversion>
-         <CoordinateSystem>
-            <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-            <CoordinateSystemName>GSE</CoordinateSystemName>
-         </CoordinateSystem>
-         <RenderingHints>
-              <DisplayType>TimeSeries</DisplayType>
-         </RenderingHints>
-         <Structure>
-            <Size>3</Size>
-            <Element>
-                <Name>x</Name>
-                <Qualifier>Component.I</Qualifier>
-                <Index>1</Index>
-                <ParameterKey>irm_orb_xyz(0)</ParameterKey>                           
-            </Element>
-            <Element>
-                <Name>y</Name>
-                <Qualifier>Component.J</Qualifier>
-                <Index>2</Index>
-                <ParameterKey>irm_orb_xyz(1)</ParameterKey>      
-            </Element>
-            <Element>
-                <Name>z</Name>
-                <Qualifier>Component.K</Qualifier>
-                <Index>3</Index>
-                <ParameterKey>irm_orb_xyz(2)</ParameterKey> 
-            </Element>
-         </Structure>
-      </Parameter>
-       <Parameter>
-           <Name>rlp_gse</Name>
-           <ParameterKey>irm_orb_rlp</ParameterKey>
-           <Description>
-               Spacecraft range, latitude, longitude in GSE Cartesian coordinates
-           </Description>
-           <Units>(Re,deg,deg)</Units>
-           <UnitsConversion></UnitsConversion>
-           <CoordinateSystem>
-               <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-               <CoordinateSystemName>GSE</CoordinateSystemName>
-           </CoordinateSystem>
-           <RenderingHints>
-               <DisplayType>TimeSeries</DisplayType>
-           </RenderingHints>
-           <Structure>
-               <Size>3</Size>
-               <Element>
-                   <Name>|r|</Name>
-                   <Qualifier>Component.I</Qualifier>
-                   <Index>1</Index>
-                   <ParameterKey>irm_orb_rlp(0)</ParameterKey>                           
-               </Element>
-               <Element>
-                   <Name>lat</Name>
-                   <Qualifier>Component.J</Qualifier>
-                   <Index>2</Index>
-                   <ParameterKey>irm_orb_rlp(1)</ParameterKey>      
-               </Element>
-               <Element>
-                   <Name>long</Name>
-                   <Qualifier>Component.K</Qualifier>
-                   <Index>3</Index>
-                   <ParameterKey>irm_orb_rlp(2)</ParameterKey> 
-               </Element>
-           </Structure>
-       </Parameter>
-       <Parameter>
-           <Name>q_flag</Name>
-           <ParameterKey>irm_orb_qfl</ParameterKey>
-           <Description>
-               Ephemeris quality flags. 0 = no error
-           </Description>
-           <RenderingHints>
-               <DisplayType>TimeSeries</DisplayType>
-           </RenderingHints>
-           <Structure>
-               <Size>1</Size>
-           </Structure>
-       </Parameter>
-
-</NumericalData>
-</Spase>
diff --git a/NumericalData/CDPP-AMDA/UKS/uks-orb-all.xml b/NumericalData/CDPP-AMDA/UKS/uks-orb-all.xml
deleted file mode 100644
index 5c6430c..0000000
--- a/NumericalData/CDPP-AMDA/UKS/uks-orb-all.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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_3_0.xsd">
-   <Version>2.3.0</Version>
-   <NumericalData>
-      <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/UKS/MAG/uks-orb-all</ResourceID>
-      <ResourceHeader>
-          <ResourceName>Orbit</ResourceName>
-          <AlternateName>Ephemeris</AlternateName>      
-          <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
-         <Description>           
-         </Description>
-          <Acknowledgement>User will acknowledge the AMPTE/UKS magnetometer team in any publication resulting from the use of these data.
-         </Acknowledgement>
-         <Contact>
-           <PersonID>spase://SMWG/Person/David.J.Southwood</PersonID>
-           <Role>PrincipalInvestigator</Role>
-         </Contact>
-          <Contact>
-              <PersonID>spase://SMWG/Person/Malcolm.W.Dunlop</PersonID>
-              <Role>DataProducer</Role>
-          </Contact>
-         <InformationURL>
-           <Name>NSSDC Master Catalog</Name>
-             <URL>https://nssdc.gsfc.nasa.gov/nmc/experiment/display.action?id=1984-088C-04</URL>
-           <Description>
-           </Description>
-         </InformationURL>
-      </ResourceHeader>
-      <AccessInformation>
-         <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
-         <Availability>Online</Availability>
-         <AccessRights>Open</AccessRights>
-         <AccessURL>
-            <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
-         </AccessURL>
-         <Format>Text</Format>
-         <Acknowledgement>
-                AMDA is a science analysis system provided by the Centre de Donnees de la 
-                Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and 
-                Universite Paul Sabatier, Toulouse
-         </Acknowledgement>
-      </AccessInformation>
-      <ProviderName></ProviderName> 
-       <ProviderResourceName></ProviderResourceName>
-      <ProviderAcknowlegment> </ProviderAcknowlegment>
-      <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/UKS/MAG</InstrumentID>
-      <MeasurementType>MagneticField</MeasurementType>
-      <TemporalDescription>
-         <TimeSpan>
-             <StartDate>1984-08-25T07:31:00</StartDate>
-             <StopDate>1985-06-15T23:59:59</StopDate>
-         </TimeSpan>
-          <Cadence>PT300S</Cadence>
-      </TemporalDescription>
-       <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
-       <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
-       <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>   
-       <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
-      <Parameter>
-         <Name>pos_gse</Name>
-         <ParameterKey>uks_orb_xyz</ParameterKey>
-         <Description>
-             Spacecraft position in GSE Cartesian coordinates
-         </Description>
-         <Units>Re</Units>
-         <UnitsConversion>6.378e6;km</UnitsConversion>
-         <CoordinateSystem>
-            <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-            <CoordinateSystemName>GSE</CoordinateSystemName>
-         </CoordinateSystem>
-         <RenderingHints>
-              <DisplayType>TimeSeries</DisplayType>
-         </RenderingHints>
-         <Structure>
-            <Size>3</Size>
-            <Element>
-                <Name>x</Name>
-                <Qualifier>Component.I</Qualifier>
-                <Index>1</Index>
-                <ParameterKey>uks_orb_xyz(0)</ParameterKey>                           
-            </Element>
-            <Element>
-                <Name>y</Name>
-                <Qualifier>Component.J</Qualifier>
-                <Index>2</Index>
-                <ParameterKey>uks_orb_xyz(1)</ParameterKey>      
-            </Element>
-            <Element>
-                <Name>z</Name>
-                <Qualifier>Component.K</Qualifier>
-                <Index>3</Index>
-                <ParameterKey>uks_orb_xyz(2)</ParameterKey> 
-            </Element>
-         </Structure>
-      </Parameter>
-       <Parameter>
-           <Name>vel_gse</Name>
-           <ParameterKey>uks_orb_v</ParameterKey>
-           <Description>
-               Spacecraft velocity in GSE Cartesian coordinates
-           </Description>
-           <Units>km/s</Units>
-           <UnitsConversion></UnitsConversion>
-           <CoordinateSystem>
-               <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
-               <CoordinateSystemName>GSE</CoordinateSystemName>
-           </CoordinateSystem>
-           <RenderingHints>
-               <DisplayType>TimeSeries</DisplayType>
-           </RenderingHints>
-           <Structure>
-               <Size>3</Size>
-               <Element>
-                   <Name>vx</Name>
-                   <Qualifier>Component.I</Qualifier>
-                   <Index>1</Index>
-                   <ParameterKey>uks_orb_v(0)</ParameterKey>                           
-               </Element>
-               <Element>
-                   <Name>vy</Name>
-                   <Qualifier>Component.J</Qualifier>
-                   <Index>2</Index>
-                   <ParameterKey>uks_orb_v(1)</ParameterKey>      
-               </Element>
-               <Element>
-                   <Name>vz</Name>
-                   <Qualifier>Component.K</Qualifier>
-                   <Index>3</Index>
-                   <ParameterKey>uks_orb_v(2)</ParameterKey> 
-               </Element>
-           </Structure>
-       </Parameter>
-
-</NumericalData>
-</Spase>
diff --git a/Observatory/CDPP-AMDA/AMPTE/CCE.xml b/Observatory/CDPP-AMDA/AMPTE/CCE.xml
index 7821380..34263c1 100644
--- a/Observatory/CDPP-AMDA/AMPTE/CCE.xml
+++ b/Observatory/CDPP-AMDA/AMPTE/CCE.xml
@@ -4,7 +4,7 @@
   <Observatory>
     <ResourceID>spase://CNES/Observatory/CDPP-AMDA/AMPTE/CCE</ResourceID>
     <ResourceHeader>
-      <ResourceName>AMPTE-CCE</ResourceName>
+      <ResourceName>CCE</ResourceName>
       <AlternateName>Charge Composition Explorer</AlternateName>
       <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
       <Description>The Active Magnetospheric Particle Tracer Explorers (AMPTE) program involves three separate spacecrafts that were launched by a single Delta vehicle on August 16, 1984. 
diff --git a/Observatory/CDPP-AMDA/AMPTE/IRM.xml b/Observatory/CDPP-AMDA/AMPTE/IRM.xml
index 005f4ce..8667187 100644
--- a/Observatory/CDPP-AMDA/AMPTE/IRM.xml
+++ b/Observatory/CDPP-AMDA/AMPTE/IRM.xml
@@ -4,7 +4,7 @@
   <Observatory>
     <ResourceID>spase://CNES/Observatory/CDPP-AMDA/AMPTE/IRM</ResourceID>
     <ResourceHeader>
-      <ResourceName>AMPTE-IRM</ResourceName>
+      <ResourceName>IRM</ResourceName>
       <AlternateName>Ion Release Module</AlternateName>
       <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
       <Description>
diff --git a/Observatory/CDPP-AMDA/AMPTE/UKS.xml b/Observatory/CDPP-AMDA/AMPTE/UKS.xml
index b53a4a7..b165160 100644
--- a/Observatory/CDPP-AMDA/AMPTE/UKS.xml
+++ b/Observatory/CDPP-AMDA/AMPTE/UKS.xml
@@ -4,7 +4,7 @@
   <Observatory>
     <ResourceID>spase://CNES/Observatory/CDPP-AMDA/AMPTE/UKS</ResourceID>
     <ResourceHeader>
-      <ResourceName>AMPTE-UKS</ResourceName>
+      <ResourceName>UKS</ResourceName>
       <AlternateName>United Kingdom Subsatellite</AlternateName>
       <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate>
       <Description>
--
libgit2 0.21.2