From ce8812d4ccf03d133507c3bb6f85aef87f0e3ced Mon Sep 17 00:00:00 2001 From: Benjamin Renard <benjamin.renard@akka.eu> Date: Tue, 14 May 2024 17:00:15 +0200 Subject: [PATCH] Cleanup master/amdadev - First part --- Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml | 1 - Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml | 1 - Instrument/CDPP-AMDA/Cluster1/CIS.xml | 1 - Instrument/CDPP-AMDA/Cluster1/EFW.xml | 1 - Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml | 1 - Instrument/CDPP-AMDA/Cluster1/FGM.xml | 1 - Instrument/CDPP-AMDA/Cluster1/PEACE.xml | 1 - Instrument/CDPP-AMDA/Cluster1/RAPID.xml | 1 - Instrument/CDPP-AMDA/Cluster1/STAFF.xml | 1 - Instrument/CDPP-AMDA/Cluster1/WHISPER.xml | 1 - Instrument/CDPP-AMDA/Cluster2/EFW.xml | 1 - Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml | 1 - Instrument/CDPP-AMDA/Cluster2/FGM.xml | 1 - Instrument/CDPP-AMDA/Cluster2/PEACE.xml | 1 - Instrument/CDPP-AMDA/Cluster2/RAPID.xml | 1 - Instrument/CDPP-AMDA/Cluster2/STAFF.xml | 1 - Instrument/CDPP-AMDA/Cluster2/WHISPER.xml | 1 - Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml | 1 - Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml | 1 - Instrument/CDPP-AMDA/Cluster3/CIS.xml | 1 - Instrument/CDPP-AMDA/Cluster3/EFW.xml | 3 +-- Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml | 1 - Instrument/CDPP-AMDA/Cluster3/FGM.xml | 1 - Instrument/CDPP-AMDA/Cluster3/PEACE.xml | 1 - Instrument/CDPP-AMDA/Cluster3/RAPID.xml | 1 - Instrument/CDPP-AMDA/Cluster3/STAFF.xml | 1 - Instrument/CDPP-AMDA/Cluster3/WHISPER.xml | 1 - Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml | 1 - Instrument/CDPP-AMDA/Cluster4/CIS.xml | 1 - Instrument/CDPP-AMDA/Cluster4/EFW.xml | 1 - Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml | 1 - Instrument/CDPP-AMDA/Cluster4/FGM.xml | 1 - Instrument/CDPP-AMDA/Cluster4/PEACE.xml | 1 - Instrument/CDPP-AMDA/Cluster4/RAPID.xml | 1 - Instrument/CDPP-AMDA/Cluster4/STAFF.xml | 1 - Instrument/CDPP-AMDA/Cluster4/WHISPER.xml | 1 - Instrument/CDPP-AMDA/Rosetta/RSN.xml | 2 +- Instrument/CDPP-AMDA/VEX/IMA.xml | 1 - NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml | 6 ------ NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml | 1 + Observatory/CDPP-AMDA/Giotto.xml | 2 +- Observatory/CDPP-AMDA/Juice.xml | 18 ++++++++++++------ Person/CDPP-AMDA/Kathrin.Altwegg.xml | 11 +++++++++++ 43 files changed, 27 insertions(+), 52 deletions(-) create mode 100644 Person/CDPP-AMDA/Kathrin.Altwegg.xml diff --git a/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml b/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml index 473827d..3c2977c 100644 --- a/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml +++ b/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/CIS</PriorID> </ResourceHeader> <InstrumentType>MassSpectrometer</InstrumentType> <InvestigationName>Cluster Ion Spectrometry (CIS) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml b/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml index 132cf8f..cb53853 100644 --- a/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml +++ b/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/CIS</PriorID> </ResourceHeader> <InstrumentType>ElectrostaticAnalyser</InstrumentType> <InvestigationName>CIS</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/CIS.xml b/Instrument/CDPP-AMDA/Cluster1/CIS.xml index 70c3c13..69fc5b6 100644 --- a/Instrument/CDPP-AMDA/Cluster1/CIS.xml +++ b/Instrument/CDPP-AMDA/Cluster1/CIS.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/CIS</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Cluster Ion Spectrometry (CIS) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/EFW.xml b/Instrument/CDPP-AMDA/Cluster1/EFW.xml index b928d3e..732e4f1 100644 --- a/Instrument/CDPP-AMDA/Cluster1/EFW.xml +++ b/Instrument/CDPP-AMDA/Cluster1/EFW.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=8</URL> <Description>Information about the Electric Field and Waves (EFW) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/EFW</PriorID> </ResourceHeader> <InstrumentType>LongWire</InstrumentType> <InvestigationName>Electric Field and Waves (EFW) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml index 75974f0..f3c807c 100644 --- a/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml +++ b/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml @@ -12,7 +12,6 @@ <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID> <Role>TechnicalContact</Role> </Contact> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/Ephemeris</PriorID> </ResourceHeader> <InstrumentType>Platform</InstrumentType> <InvestigationName>Spacecraft position</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/FGM.xml b/Instrument/CDPP-AMDA/Cluster1/FGM.xml index 108cbae..39da814 100644 --- a/Instrument/CDPP-AMDA/Cluster1/FGM.xml +++ b/Instrument/CDPP-AMDA/Cluster1/FGM.xml @@ -22,7 +22,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=4</URL> <Description>Information about the Fluxgate Magnetometer (FGM) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/FGM</PriorID> </ResourceHeader> <InstrumentType>Magnetometer</InstrumentType> <InvestigationName>Fluxgate Magnetometer (FGM) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/PEACE.xml b/Instrument/CDPP-AMDA/Cluster1/PEACE.xml index 9ea0dd7..a274de5 100644 --- a/Instrument/CDPP-AMDA/Cluster1/PEACE.xml +++ b/Instrument/CDPP-AMDA/Cluster1/PEACE.xml @@ -36,7 +36,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=5</URL> <Description>Information about the Plasma Electron and Current Experiment (PEACE) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/PEACE</PriorID> </ResourceHeader> <InstrumentType>ElectrostaticAnalyser</InstrumentType> <InvestigationName>Plasma Electron and Current Experiment (PEACE) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/RAPID.xml b/Instrument/CDPP-AMDA/Cluster1/RAPID.xml index 9162cf0..1f1c730 100644 --- a/Instrument/CDPP-AMDA/Cluster1/RAPID.xml +++ b/Instrument/CDPP-AMDA/Cluster1/RAPID.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=6</URL> <Description>Information about the Research with Adaptive Particle Imaging Detectors (RAPID) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/RAPID</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Research with Adaptive Particle Imaging Detectors (RAPID) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/STAFF.xml b/Instrument/CDPP-AMDA/Cluster1/STAFF.xml index 394aac5..3089958 100644 --- a/Instrument/CDPP-AMDA/Cluster1/STAFF.xml +++ b/Instrument/CDPP-AMDA/Cluster1/STAFF.xml @@ -28,7 +28,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=9</URL> <Description>Information about STAFF experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/STAFF</PriorID> </ResourceHeader> <InstrumentType>SearchCoil</InstrumentType> <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM5 (Rumba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml index 964ab20..7985a02 100644 --- a/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml +++ b/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml @@ -32,7 +32,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=11</URL> <Description>Information about the Waves of HF and Sounder for Probing Electron Density by Relaxation (WHISPER) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/WHISPER</PriorID> </ResourceHeader> <InstrumentType>DoubleSphere</InstrumentType> <InvestigationName>Wave Experiment Consortium</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/EFW.xml b/Instrument/CDPP-AMDA/Cluster2/EFW.xml index 58c8798..010682f 100644 --- a/Instrument/CDPP-AMDA/Cluster2/EFW.xml +++ b/Instrument/CDPP-AMDA/Cluster2/EFW.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=8</URL> <Description>Information about the Electric Field and Waves (EFW) experiment on the Cluster 2/FM6 (Salsa) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/EFW</PriorID> </ResourceHeader> <InstrumentType>LongWire</InstrumentType> <InvestigationName>Electric Field and Waves (EFW) on Cluster 2/FM6 (Salsa)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml index 5e53895..851ed1e 100644 --- a/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml +++ b/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml @@ -12,7 +12,6 @@ <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID> <Role>TechnicalContact</Role> </Contact> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/Ephemeris</PriorID> </ResourceHeader> <InstrumentType>Platform</InstrumentType> <InvestigationName>Spacecraft position</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/FGM.xml b/Instrument/CDPP-AMDA/Cluster2/FGM.xml index 8fbdcf2..2af216f 100644 --- a/Instrument/CDPP-AMDA/Cluster2/FGM.xml +++ b/Instrument/CDPP-AMDA/Cluster2/FGM.xml @@ -22,7 +22,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=4</URL> <Description>Information about the Fluxgate Magnetometer (FGM) experiment on the Cluster 2/FM6 (Salsa) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/FGM</PriorID> </ResourceHeader> <InstrumentType>Magnetometer</InstrumentType> <InvestigationName>Fluxgate Magnetometer (FGM) on Cluster 2/FM6 (Salsa)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/PEACE.xml b/Instrument/CDPP-AMDA/Cluster2/PEACE.xml index 4eeecd2..30c9634 100644 --- a/Instrument/CDPP-AMDA/Cluster2/PEACE.xml +++ b/Instrument/CDPP-AMDA/Cluster2/PEACE.xml @@ -36,7 +36,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=5</URL> <Description>Information about the Plasma Electron and Current Experiment (PEACE) experiment on the Cluster 2/FM6 (Salsa) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/PEACE</PriorID> </ResourceHeader> <InstrumentType>ElectrostaticAnalyser</InstrumentType> <InvestigationName>Plasma Electron and Current Experiment (PEACE) on Cluster 2/FM6 (Salsa)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/RAPID.xml b/Instrument/CDPP-AMDA/Cluster2/RAPID.xml index c3af795..4eea0f6 100644 --- a/Instrument/CDPP-AMDA/Cluster2/RAPID.xml +++ b/Instrument/CDPP-AMDA/Cluster2/RAPID.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-041B&ex=6</URL> <Description>Information about the Research with Adaptive Particle Imaging Detectors (RAPID) experiment on the Cluster 2/FM6 (Salsa) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/RAPID</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Research with Adaptive Particle Imaging Detectors (RAPID) on Cluster 2/FM6 (Salsa)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/STAFF.xml b/Instrument/CDPP-AMDA/Cluster2/STAFF.xml index 52f3fa1..5b2f39c 100644 --- a/Instrument/CDPP-AMDA/Cluster2/STAFF.xml +++ b/Instrument/CDPP-AMDA/Cluster2/STAFF.xml @@ -28,7 +28,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=9</URL> <Description>Information about STAFF experiment on the Cluster 2/FM6 (Salsa) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/STAFF</PriorID> </ResourceHeader> <InstrumentType>SearchCoil</InstrumentType> <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM6 (Salsa)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml index 57a553a..a97852e 100644 --- a/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml +++ b/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml @@ -32,7 +32,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=11</URL> <Description>Information about the Waves of HF and Sounder for Probing Electron Density by Relaxation (WHISPER) experiment on the Cluster 2/FM5 (Salsa) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/WHISPER</PriorID> </ResourceHeader> <InstrumentType>DoubleSphere</InstrumentType> <InvestigationName>Wave Experiment Consortium</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml b/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml index d9895cf..9ddbaa4 100644 --- a/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml +++ b/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-041A&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/CIS</PriorID> </ResourceHeader> <InstrumentType>MassSpectrometer</InstrumentType> <InvestigationName>Cluster Ion Spectrometry (CIS) on Cluster 2/FM7 (Samba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml b/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml index 73352a3..25d79a7 100644 --- a/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml +++ b/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM5 (Rumba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/CIS</PriorID> </ResourceHeader> <InstrumentType>ElectrostaticAnalyser</InstrumentType> <InvestigationName>CIS</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/CIS.xml b/Instrument/CDPP-AMDA/Cluster3/CIS.xml index 7548032..1380bda 100644 --- a/Instrument/CDPP-AMDA/Cluster3/CIS.xml +++ b/Instrument/CDPP-AMDA/Cluster3/CIS.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-041A&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/CIS</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Cluster Ion Spectrometry (CIS) on Cluster 2/FM7 (Samba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/EFW.xml b/Instrument/CDPP-AMDA/Cluster3/EFW.xml index 880dd66..d87931b 100644 --- a/Instrument/CDPP-AMDA/Cluster3/EFW.xml +++ b/Instrument/CDPP-AMDA/Cluster3/EFW.xml @@ -23,10 +23,9 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=8</URL> <Description>Information about the Electric Field and Waves (EFW) experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/EFW</PriorID> </ResourceHeader> <InstrumentType>LongWire</InstrumentType> - <InvestigationName>Electric Field and Waves (EFW) on Cluster 2/FM7 (Samba)</InvestigationName> + <InvestigationName>Electric Field and Waves (EFW) on Cluster 3/FM7 (Samba)</InvestigationName> <OperatingSpan> <StartDate>2000-12-01T00:00:00</StartDate> <Note>Start of full orbit coverage: 2002-06-01T00:00:00</Note> diff --git a/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml index 2bac9f0..de7a2c7 100644 --- a/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml +++ b/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml @@ -12,7 +12,6 @@ <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID> <Role>TechnicalContact</Role> </Contact> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/Ephemeris</PriorID> </ResourceHeader> <InstrumentType>Platform</InstrumentType> <InvestigationName>Spacecraft position</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/FGM.xml b/Instrument/CDPP-AMDA/Cluster3/FGM.xml index dd4542d..1afab23 100644 --- a/Instrument/CDPP-AMDA/Cluster3/FGM.xml +++ b/Instrument/CDPP-AMDA/Cluster3/FGM.xml @@ -22,7 +22,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=4</URL> <Description>Information about the Fluxgate Magnetometer (FGM) experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/FGM</PriorID> </ResourceHeader> <InstrumentType>Magnetometer</InstrumentType> <InvestigationName>Fluxgate Magnetometer (FGM) on Cluster 2/FM7 (Samba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/PEACE.xml b/Instrument/CDPP-AMDA/Cluster3/PEACE.xml index 4bad3e6..8c46e39 100644 --- a/Instrument/CDPP-AMDA/Cluster3/PEACE.xml +++ b/Instrument/CDPP-AMDA/Cluster3/PEACE.xml @@ -36,7 +36,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=5</URL> <Description>Information about the Plasma Electron and Current Experiment (PEACE) experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/PEACE</PriorID> </ResourceHeader> <InstrumentType>ElectrostaticAnalyser</InstrumentType> <InvestigationName>Plasma Electron and Current Experiment (PEACE) on Cluster 2/FM7 (Samba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/RAPID.xml b/Instrument/CDPP-AMDA/Cluster3/RAPID.xml index acfd343..05c474e 100644 --- a/Instrument/CDPP-AMDA/Cluster3/RAPID.xml +++ b/Instrument/CDPP-AMDA/Cluster3/RAPID.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-041A&ex=6</URL> <Description>Information about the Research with Adaptive Particle Imaging Detectors (RAPID) experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/RAPID</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Research with Adaptive Particle Imaging Detectors (RAPID) on Cluster 2/FM7 (Samba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/STAFF.xml b/Instrument/CDPP-AMDA/Cluster3/STAFF.xml index 085f5ed..63e56a9 100644 --- a/Instrument/CDPP-AMDA/Cluster3/STAFF.xml +++ b/Instrument/CDPP-AMDA/Cluster3/STAFF.xml @@ -28,7 +28,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=9</URL> <Description>Information about STAFF experiment on the Cluster 2/FM7 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/STAFF</PriorID> </ResourceHeader> <InstrumentType>SearchCoil</InstrumentType> <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM7 (Samba)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml index c38f4b6..67669d5 100644 --- a/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml +++ b/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml @@ -32,7 +32,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=11</URL> <Description>Information about the Waves of HF and Sounder for Probing Electron Density by Relaxation (WHISPER) experiment on the Cluster 2/FM5 (Samba) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Samba/WHISPER</PriorID> </ResourceHeader> <InstrumentType>DoubleSphere</InstrumentType> <InvestigationName>Wave Experiment Consortium</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml b/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml index 54bc928..5adddc6 100644 --- a/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml +++ b/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045B&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/CIS</PriorID> </ResourceHeader> <InstrumentType>MassSpectrometer</InstrumentType> <InvestigationName>Cluster Ion Spectrometry (CIS) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/CIS.xml b/Instrument/CDPP-AMDA/Cluster4/CIS.xml index 8d6f8a0..39ff7a2 100644 --- a/Instrument/CDPP-AMDA/Cluster4/CIS.xml +++ b/Instrument/CDPP-AMDA/Cluster4/CIS.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045B&ex=2</URL> <Description>Information about the Cluster Ion Spectrometry (CIS) experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/CIS</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Cluster Ion Spectrometry (CIS) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/EFW.xml b/Instrument/CDPP-AMDA/Cluster4/EFW.xml index d4b1739..3afc836 100644 --- a/Instrument/CDPP-AMDA/Cluster4/EFW.xml +++ b/Instrument/CDPP-AMDA/Cluster4/EFW.xml @@ -23,7 +23,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=8</URL> <Description>Information about the Electric Field and Waves (EFW) experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/EFW</PriorID> </ResourceHeader> <InstrumentType>LongWire</InstrumentType> <InvestigationName>Electric Field and Waves (EFW) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml index c6af8df..28e99bd 100644 --- a/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml +++ b/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml @@ -12,7 +12,6 @@ <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID> <Role>TechnicalContact</Role> </Contact> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/Ephemeris</PriorID> </ResourceHeader> <InstrumentType>Platform</InstrumentType> <InvestigationName>Spacecraft position</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/FGM.xml b/Instrument/CDPP-AMDA/Cluster4/FGM.xml index d80790c..77deea2 100644 --- a/Instrument/CDPP-AMDA/Cluster4/FGM.xml +++ b/Instrument/CDPP-AMDA/Cluster4/FGM.xml @@ -22,7 +22,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=4</URL> <Description>Information about the Fluxgate Magnetometer (FGM) experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/FGM</PriorID> </ResourceHeader> <InstrumentType>Magnetometer</InstrumentType> <InvestigationName>Fluxgate Magnetometer (FGM) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/PEACE.xml b/Instrument/CDPP-AMDA/Cluster4/PEACE.xml index aab4c3f..76b9074 100644 --- a/Instrument/CDPP-AMDA/Cluster4/PEACE.xml +++ b/Instrument/CDPP-AMDA/Cluster4/PEACE.xml @@ -36,7 +36,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=5</URL> <Description>Information about the Plasma Electron and Current Experiment (PEACE) experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/PEACE</PriorID> </ResourceHeader> <InstrumentType>ElectrostaticAnalyser</InstrumentType> <InvestigationName>Plasma Electron and Current Experiment (PEACE) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/RAPID.xml b/Instrument/CDPP-AMDA/Cluster4/RAPID.xml index 7fa7a56..27a6caa 100644 --- a/Instrument/CDPP-AMDA/Cluster4/RAPID.xml +++ b/Instrument/CDPP-AMDA/Cluster4/RAPID.xml @@ -17,7 +17,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045B&ex=6</URL> <Description>Information about the Research with Adaptive Particle Imaging Detectors (RAPID) experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/RAPID</PriorID> </ResourceHeader> <InstrumentType>EnergeticParticleInstrument</InstrumentType> <InvestigationName>Research with Adaptive Particle Imaging Detectors (RAPID) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/STAFF.xml b/Instrument/CDPP-AMDA/Cluster4/STAFF.xml index 673ebdf..7389c1a 100644 --- a/Instrument/CDPP-AMDA/Cluster4/STAFF.xml +++ b/Instrument/CDPP-AMDA/Cluster4/STAFF.xml @@ -28,7 +28,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=9</URL> <Description>Information about STAFF experiment on the Cluster 2/FM8 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/STAFF</PriorID> </ResourceHeader> <InstrumentType>SearchCoil</InstrumentType> <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM8 (Tango)</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml index 6b455fa..62380fe 100644 --- a/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml +++ b/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml @@ -32,7 +32,6 @@ <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&ex=11</URL> <Description>Information about the Waves of HF and Sounder for Probing Electron Density by Relaxation (WHISPER) experiment on the Cluster 2/FM5 (Tango) mission.</Description> </InformationURL> - <PriorID>spase://SMWG/Instrument/Cluster2-Tango/WHISPER</PriorID> </ResourceHeader> <InstrumentType>DoubleSphere</InstrumentType> <InvestigationName>Wave Experiment Consortium</InvestigationName> diff --git a/Instrument/CDPP-AMDA/Rosetta/RSN.xml b/Instrument/CDPP-AMDA/Rosetta/RSN.xml index be07609..dc2b4fb 100644 --- a/Instrument/CDPP-AMDA/Rosetta/RSN.xml +++ b/Instrument/CDPP-AMDA/Rosetta/RSN.xml @@ -18,7 +18,7 @@ measuring both total and ram pressure, and will be used to determine the gas density and rate of radial gas flow.</Description> <Contact> - <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID> + <PersonID>spase://CNES/Person/CDPP-AMDA/Kathrin.Altwegg</PersonID> <Role>PrincipalInvestigator</Role> </Contact> </ResourceHeader> diff --git a/Instrument/CDPP-AMDA/VEX/IMA.xml b/Instrument/CDPP-AMDA/VEX/IMA.xml index b9638b7..7e0d302 100644 --- a/Instrument/CDPP-AMDA/VEX/IMA.xml +++ b/Instrument/CDPP-AMDA/VEX/IMA.xml @@ -37,6 +37,5 @@ the matrix azimuth x mass.</Description><!--- AMDA help --> <Note>Data Gap : 2014-10-13T00:00:00Z - 2014-11-07T00:00:00Z</Note><!--- if possible note large data gaps; multiple Note tags --> </OperatingSpan><!-- shown in instrument tooltip in the AMDA tree --> <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/VEX</ObservatoryID><!--- don't modify --> - <!--- AMDA help, if exists --> </Instrument> </Spase> diff --git a/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml index a7e862f..5a27444 100644 --- a/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml +++ b/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml @@ -14,12 +14,6 @@ <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> <Role>PrincipalInvestigator</Role> </Contact> - <InformationURL> - <URL> - </URL> - <Description> - </Description> - </InformationURL> </ResourceHeader> <AccessInformation> <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID> diff --git a/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml b/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml index cfaeef5..6d229c0 100644 --- a/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml +++ b/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml @@ -46,6 +46,7 @@ </AccessInformation> <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderName>HESPERIA</ProviderName> + <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderResourceName>https://hesperia.gsfc.nasa.gov/fermi/lat</ProviderResourceName> <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/FERMI/LAT</InstrumentID> <MeasurementType>Radiance</MeasurementType> diff --git a/Observatory/CDPP-AMDA/Giotto.xml b/Observatory/CDPP-AMDA/Giotto.xml index b5d3cf5..d824a3d 100644 --- a/Observatory/CDPP-AMDA/Giotto.xml +++ b/Observatory/CDPP-AMDA/Giotto.xml @@ -7,7 +7,7 @@ <ResourceName>Giotto</ResourceName> <AlternateName>ESA's first deep space mission: P1/Halley Flyby</AlternateName> <ReleaseDate>2017-03-27T18:45:12Z</ReleaseDate> - <Description>>ESA's first deep space mission, Giotto was designed to help solve the mysteries + <Description>>ESA's first deep space mission, Giotto was designed to help solve the mysteries surrounding Comet Halley by passing as close as possible to the comet's nucleus, which it achieved on 14 March 1986 at a distance of just under 600 km. No-one expected the spacecraft to survive its battering from comet dust during this encounter, diff --git a/Observatory/CDPP-AMDA/Juice.xml b/Observatory/CDPP-AMDA/Juice.xml index b39452a..648f971 100644 --- a/Observatory/CDPP-AMDA/Juice.xml +++ b/Observatory/CDPP-AMDA/Juice.xml @@ -7,20 +7,26 @@ <ResourceName>JUICE</ResourceName> <AlternateName>JUpiter ICy moons Explorer</AlternateName> <ReleaseDate>2010-09-27T18:45:12Z</ReleaseDate> - <Description>JUICE - JUpiter ICy moons Explorer - is the first large-class mission in ESA's Cosmic Vision 2015-2025 programme. - Planned for launch in May 2022 and arrival at Jupiter in October 2029, it will spend at least three years making detailed - observations of the giant gaseous planet Jupiter and three of its largest moons, Ganymede, Callisto and Europa</Description> + <Description>ESA’s Jupiter Icy Moons Explorer, Juice, will make detailed observations of the giant gas planet + and its three large ocean-bearing moons – Ganymede, Callisto and Europa – with a suite of remote sensing, + geophysical and in situ instruments. The mission will characterise these moons as both planetary objects + and possible habitats, explore Jupiter’s complex environment in depth, and study the wider Jupiter system as an + archetype for gas giants across the Universe. Juice was launched on April 14, 2023.</Description> <Contact> <PersonID>spase://CNES/Person/CDPP-AMDA/Olivier.Witasse</PersonID> <Role>ProjectScientist</Role> - </Contact> + </Contact> + <InformationURL> + <Name>ESA Website</Name> + <URL>https://www.esa.int/Science_Exploration/Space_Science/Juice</URL> + </InformationURL> </ResourceHeader> <Location> <ObservatoryRegion>Jupiter</ObservatoryRegion> </Location> <OperatingSpan> - <StartDate>2022-06-01T00:00:00</StartDate> - <Note>Jupiter arrival : 2029-10-xx</Note> + <StartDate>2023-04-14T00:00:00</StartDate> + <Note>Jupiter arrival : 2031-07-xx</Note> </OperatingSpan> </Observatory> </Spase> diff --git a/Person/CDPP-AMDA/Kathrin.Altwegg.xml b/Person/CDPP-AMDA/Kathrin.Altwegg.xml new file mode 100644 index 0000000..51d3197 --- /dev/null +++ b/Person/CDPP-AMDA/Kathrin.Altwegg.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.4.1.xsd"> +<Version>2.4.1</Version> + <Person> + <ResourceID>spase://CNES/Person/CDPP-AMDA/Kathrin.Altwegg</ResourceID> + <ReleaseDate>2023-12-12T00:00:00Z</ReleaseDate> + <PersonName>Kathrin Altwegg</PersonName> + <OrganizationName>University of Bern</OrganizationName> + <Email>altwegg@space.unibe.ch</Email> + </Person> +</Spase> -- libgit2 0.21.2