From 37e4e10a72aadc1d1cd6f56f777b9d9cf4b2b86c Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Wed, 23 Jan 2019 12:32:20 +0100
Subject: [PATCH] SolarOrbiter orbiy correction

---
 Instrument/AMDA/Solar_Orbiter/Ephemeris.xml               | 10 +++++-----
 Instrument/AMDA/Solar_Orbiter/PAS.xml                     |  2 +-
 NumericalData/AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml | 41 ++++++++++++++---------------------------
 Observatory/AMDA/SO.xml                                   | 20 --------------------
 Observatory/AMDA/SolO.xml                                 | 20 ++++++++++++++++++++
 5 files changed, 40 insertions(+), 53 deletions(-)
 delete mode 100644 Observatory/AMDA/SO.xml
 create mode 100644 Observatory/AMDA/SolO.xml

diff --git a/Instrument/AMDA/Solar_Orbiter/Ephemeris.xml b/Instrument/AMDA/Solar_Orbiter/Ephemeris.xml
index de43923..f533bd5 100644
--- a/Instrument/AMDA/Solar_Orbiter/Ephemeris.xml
+++ b/Instrument/AMDA/Solar_Orbiter/Ephemeris.xml
@@ -7,14 +7,14 @@
       <ResourceName>Ephemeris</ResourceName>
       <AlternateName>Solar Orbiter ephemeris</AlternateName>
       <ReleaseDate>2018-10-28T21:10:13Z</ReleaseDate>
-      <Description></Description>
-      <Contact>      
-        <PersonID></PersonID>
-        <Role>MetadataContact</Role>
+      <Description>Calculated at IRAP from SPICE kernels</Description>
+      <Contact>
+        <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+        <Role>DataProducer</Role>
       </Contact>
     </ResourceHeader>
     <InstrumentType>Platform</InstrumentType>
     <InvestigationName>Spacecraft position</InvestigationName>
-    <ObservatoryID>spase://CDPP/Observatory/AMDA/SO</ObservatoryID>
+    <ObservatoryID>spase://CDPP/Observatory/AMDA/SolO</ObservatoryID>
   </Instrument>
 </Spase>
diff --git a/Instrument/AMDA/Solar_Orbiter/PAS.xml b/Instrument/AMDA/Solar_Orbiter/PAS.xml
index 0a094fd..be88ae2 100644
--- a/Instrument/AMDA/Solar_Orbiter/PAS.xml
+++ b/Instrument/AMDA/Solar_Orbiter/PAS.xml
@@ -25,6 +25,6 @@
     </ResourceHeader>
     <InstrumentType>ParticleDetector</InstrumentType>
     <InvestigationName>SWA</InvestigationName>
-    <ObservatoryID>spase://CDPP/Observatory/AMDA/SO</ObservatoryID>
+    <ObservatoryID>spase://CDPP/Observatory/AMDA/SolO</ObservatoryID>
   </Instrument>
 </Spase>
diff --git a/NumericalData/AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml b/NumericalData/AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
index f94d1e6..afe393a 100644
--- a/NumericalData/AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
+++ b/NumericalData/AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
@@ -5,21 +5,18 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/Solar_Orbiter/ephemeris/so-orb-all</ResourceID>
       <ResourceHeader>
          <ResourceName>orbit</ResourceName>
-         <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
-         <Description>                        
-         </Description>
-         <Acknowledgement>            
-         </Acknowledgement>
-         <Contact>        
-            <PersonID/>
-            <Role/>
+         <AlternateName>SolO ephemeris</AlternateName>
+         <ReleaseDate>2019-01-12T10:48:29Z</ReleaseDate>
+         <Description>Calculated at IRAP using SPICE kernels</Description>
+         <Acknowledgement/>                  
+         <Contact>
+            <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+            <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
-           <Name/>
-           <URL>              
-           </URL>
-           <Description>             
-           </Description>
+           <Name>Solar Orbiter SPICE Kernels</Name>
+           <URL>https://issues.cosmos.esa.int/solarorbiterwiki/display/SOSP/Solar+Orbiter+SPICE+Kernels</URL>
+           <Description/>                        
          </InformationURL>       
       </ResourceHeader>
       <AccessInformation>
@@ -28,15 +25,14 @@
          <AccessRights>Open</AccessRights>
          <AccessURL>
             <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
+            <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
          <Format>Text</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
-      <ProviderName/> 
+      <ProviderName>ESA</ProviderName>
+      <ProviderResourceName>solo_ANC_soc-orbit_20200207-20300902_V01.bsp</ProviderResourceName>
       <InstrumentID>spase://CDPP/Instrument/AMDA/Solar_Orbiter/Ephemeris</InstrumentID>
       <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
@@ -60,7 +56,6 @@
              <Size>3</Size>
              <Element>
                 <Name>x</Name>
-                <Qualifier/>
                 <Index>1</Index>
                 <ParameterKey>so_all_xyz(0)</ParameterKey>
                 <ValidMin/>
@@ -69,7 +64,6 @@
              </Element>
              <Element>
                 <Name>y</Name>
-                <Qualifier/>
                 <Index>2</Index>
                 <ParameterKey>so_all_xyz(1)</ParameterKey>
                 <ValidMin/>
@@ -78,7 +72,6 @@
              </Element>
              <Element>
                 <Name>z</Name>
-                <Qualifier/>
                 <Index>3</Index>
                 <ParameterKey>so_all_xyz(2)</ParameterKey>
                 <ValidMin/>
@@ -88,7 +81,7 @@
           </Structure>
        </Parameter>
       <Parameter>
-         <Name>distance so-sun</Name>
+         <Name>distance solo-sun</Name>
          <ParameterKey>so_all_r</ParameterKey>
          <Description/>
          <Ucd/>
@@ -122,7 +115,6 @@
             <Size>3</Size>
             <Element>
                <Name>x</Name>
-               <Qualifier/>
                <Index>1</Index>
                <ParameterKey>so_all_hee(0)</ParameterKey>
                <ValidMin/>
@@ -131,7 +123,6 @@
             </Element>
             <Element>
                <Name>y</Name>
-               <Qualifier/>
                <Index>2</Index>
                <ParameterKey>so_all_hee(1)</ParameterKey>
                <ValidMin/>
@@ -140,7 +131,6 @@
             </Element>
             <Element>
                <Name>z</Name>
-               <Qualifier/>
                <Index>3</Index>
                <ParameterKey>so_all_hee(2)</ParameterKey>
                <ValidMin/>
@@ -159,7 +149,6 @@
          <Structure><Size>3</Size>
             <Element>
                <Name>x</Name>
-               <Qualifier/>
                <Index>1</Index>
                <ParameterKey>so_all_heeq(0)</ParameterKey>
                <ValidMin/>
@@ -168,7 +157,6 @@
             </Element>
             <Element>
                <Name>y</Name>
-               <Qualifier/>
                <Index>2</Index>
                <ParameterKey>so_all_heeq(1)</ParameterKey>
                <ValidMin/>
@@ -177,7 +165,6 @@
             </Element>
             <Element>
                <Name>z</Name>
-               <Qualifier/>
                <Index>3</Index>
                <ParameterKey>so_all_heeq(2)</ParameterKey>
                <ValidMin/>
diff --git a/Observatory/AMDA/SO.xml b/Observatory/AMDA/SO.xml
deleted file mode 100644
index 7b2461a..0000000
--- a/Observatory/AMDA/SO.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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://www.spase-group.org/data/schema/spase-2_2_6.xsd">
-  <Version>2.2.6</Version>
-  <Observatory>
-    <ResourceID>spase://CDPP/Observatory/AMDA/SO</ResourceID>
-    <ResourceHeader>
-      <ResourceName>SolO</ResourceName>
-      <AlternateName>Solar Orbiter</AlternateName>
-      <ReleaseDate>2018-10-27T18:45:12Z</ReleaseDate>
-      <Description></Description>
-      <Contact>     
-        <PersonID> </PersonID>
-        <Role>ProjectScientist</Role>
-      </Contact>      
-    </ResourceHeader>
-    <Location> 
-      <ObservatoryRegion>Heliosphere.Inner</ObservatoryRegion>      
-    </Location>
-  </Observatory>
-</Spase>
diff --git a/Observatory/AMDA/SolO.xml b/Observatory/AMDA/SolO.xml
new file mode 100644
index 0000000..b2dc352
--- /dev/null
+++ b/Observatory/AMDA/SolO.xml
@@ -0,0 +1,20 @@
+<?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://www.spase-group.org/data/schema/spase-2_2_6.xsd">
+  <Version>2.2.6</Version>
+  <Observatory>
+    <ResourceID>spase://CDPP/Observatory/AMDA/SolO</ResourceID>
+    <ResourceHeader>
+      <ResourceName>SolO</ResourceName>
+      <AlternateName>Solar Orbiter</AlternateName>
+      <ReleaseDate>2018-10-27T18:45:12Z</ReleaseDate>
+      <Description></Description>
+      <Contact>     
+        <PersonID> </PersonID>
+        <Role>ProjectScientist</Role>
+      </Contact>      
+    </ResourceHeader>
+    <Location> 
+      <ObservatoryRegion>Heliosphere.Inner</ObservatoryRegion>      
+    </Location>
+  </Observatory>
+</Spase>
--
libgit2 0.21.2