diff --git a/Instrument/CDPP-AMDA/ACE/EPAM.xml b/Instrument/CDPP-AMDA/ACE/EPAM.xml index a89ce31..ce197ed 100644 --- a/Instrument/CDPP-AMDA/ACE/EPAM.xml +++ b/Instrument/CDPP-AMDA/ACE/EPAM.xml @@ -1,11 +1,11 @@ <?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_0_0.xsd"> - <Version>2.0.0</Version> +<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_4_1.xsd"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/ACE/EPAM</ResourceID> <ResourceHeader> <ResourceName>EPAM</ResourceName> - <ResourceName>ACE Electron Proton Alpha Monitor</ResourceName> + <AlternateName>ACE Electron Proton Alpha Monitor</AlternateName> <AlternateName>ACE EPAM</AlternateName> <AlternateName>1997-045A-08</AlternateName> <ReleaseDate>2019-05-05T12:34:56Z</ReleaseDate> diff --git a/Instrument/CDPP-AMDA/BepiColombo/Mio/ENA.xml b/Instrument/CDPP-AMDA/BepiColombo/Mio/ENA.xml index 8492a13..a595fe3 100644 --- a/Instrument/CDPP-AMDA/BepiColombo/Mio/ENA.xml +++ b/Instrument/CDPP-AMDA/BepiColombo/Mio/ENA.xml @@ -1,6 +1,6 @@ <?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.3.1</Version> +<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_4_1.xsd"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/BepiColombo/Mio/ENA</ResourceID> <ResourceHeader> @@ -15,7 +15,7 @@ </Contact> <PriorID/> </ResourceHeader> - <InstrumentType>neutral</InstrumentType> + <InstrumentType>NeutralParticleDetector</InstrumentType> <InvestigationName/> <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/BepiColombo/Mio</ObservatoryID> <Caveats/> diff --git a/Instrument/CDPP-AMDA/BepiColombo/Mio/MGF.xml b/Instrument/CDPP-AMDA/BepiColombo/Mio/MGF.xml index 1d1353a..0c7e146 100644 --- a/Instrument/CDPP-AMDA/BepiColombo/Mio/MGF.xml +++ b/Instrument/CDPP-AMDA/BepiColombo/Mio/MGF.xml @@ -1,6 +1,6 @@ <?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.3.1</Version> +<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_4_1.xsd"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/BepiColombo/Mio/MGF</ResourceID> <ResourceHeader> diff --git a/Instrument/CDPP-AMDA/BepiColombo/Mio/MSA.xml b/Instrument/CDPP-AMDA/BepiColombo/Mio/MSA.xml index 45f3027..783910c 100644 --- a/Instrument/CDPP-AMDA/BepiColombo/Mio/MSA.xml +++ b/Instrument/CDPP-AMDA/BepiColombo/Mio/MSA.xml @@ -1,6 +1,6 @@ <?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.3.1</Version> +<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_4_1.xsd"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/BepiColombo/Mio/MSA</ResourceID> <ResourceHeader> diff --git a/Instrument/CDPP-AMDA/MMS1/HPCA.xml b/Instrument/CDPP-AMDA/MMS1/HPCA.xml index adfe929..d684bca 100644 --- a/Instrument/CDPP-AMDA/MMS1/HPCA.xml +++ b/Instrument/CDPP-AMDA/MMS1/HPCA.xml @@ -15,14 +15,14 @@ <Contact> <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID> <Role>PrincipalInvestigator</Role> - </Contact> + </Contact> + <InformationURL> + <Name>Young, D.T., Burch, J.L., Gomez, R.G. et al. Hot Plasma Composition Analyzer for the Magnetospheric Multiscale Mission. Space Sci Rev 199, 407–470 (2016). https://doi.org/10.1007/s11214-014-0119-6</Name> + <URL>https://link.springer.com/article/10.1007/s11214-014-0119-6</URL> + </InformationURL> </ResourceHeader> <InstrumentType>MassSpectrometer</InstrumentType> <InvestigationName/> <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/MMS1</ObservatoryID> - <InformationURL> - <Name>Young, D.T., Burch, J.L., Gomez, R.G. et al. Hot Plasma Composition Analyzer for the Magnetospheric Multiscale Mission. Space Sci Rev 199, 407–470 (2016). https://doi.org/10.1007/s11214-014-0119-6</Name> - <URL>https://link.springer.com/article/10.1007/s11214-014-0119-6</URL> - </InformationURL> </Instrument> </Spase> diff --git a/Instrument/CDPP-AMDA/MMS1234/FGM.xml b/Instrument/CDPP-AMDA/MMS1234/FGM.xml index c179e99..a530854 100644 --- a/Instrument/CDPP-AMDA/MMS1234/FGM.xml +++ b/Instrument/CDPP-AMDA/MMS1234/FGM.xml @@ -29,11 +29,7 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID> <Role>PrincipalInvestigator</Role> </Contact> - </ResourceHeader> - <InstrumentType>Magnetometer</InstrumentType> - <InvestigationName>FluxGate Magnetometer (FGM)</InvestigationName> - <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/MMS1234</ObservatoryID> - <InformationURL> + <InformationURL> <Name>Russell, C.T., Anderson, B.J., Baumjohann, W. et al. The Magnetospheric Multiscale Magnetometers. Space Sci Rev 199, 189–256 (2016). https://doi.org/10.1007/s11214-014-0057-3</Name> <URL>https://link.springer.com/article/10.1007/s11214-014-0057-3</URL> </InformationURL> @@ -41,6 +37,10 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc <InformationURL> <Name>Torbert, R.B., Russell, C.T., Magnes, W. et al. The FIELDS Instrument Suite on MMS: Scientific Objectives, Measurements, and Data Products. Space Sci Rev 199, 105–135 (2016). https://doi.org/10.1007/s11214-014-0109-8</Name> <URL>https://link.springer.com/article/10.1007/s11214-014-0109-8</URL> - </InformationURL> + </InformationURL> + </ResourceHeader> + <InstrumentType>Magnetometer</InstrumentType> + <InvestigationName>FluxGate Magnetometer (FGM)</InvestigationName> + <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/MMS1234</ObservatoryID> </Instrument> </Spase> diff --git a/Instrument/CDPP-AMDA/PSP/LFR.xml b/Instrument/CDPP-AMDA/PSP/LFR.xml index 32ee97c..4c66a1c 100644 --- a/Instrument/CDPP-AMDA/PSP/LFR.xml +++ b/Instrument/CDPP-AMDA/PSP/LFR.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<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_3_1.xsd" lang="en"> - <Version>2.3.1</Version> +<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_4_1.xsd" lang="en"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/PSP/LFR</ResourceID> <ResourceHeader> diff --git a/Instrument/CDPP-AMDA/SOHO/COSTEP.xml b/Instrument/CDPP-AMDA/SOHO/COSTEP.xml index 9fe42b9..f895458 100644 --- a/Instrument/CDPP-AMDA/SOHO/COSTEP.xml +++ b/Instrument/CDPP-AMDA/SOHO/COSTEP.xml @@ -1,6 +1,6 @@ <?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_0_0.xsd"> - <Version>2.0.0</Version> +<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_4_1.xsd"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/SOHO/COSTEP</ResourceID> <ResourceHeader> diff --git a/Instrument/CDPP-AMDA/SOHO/ERNE.xml b/Instrument/CDPP-AMDA/SOHO/ERNE.xml index 6fc4d2c..7252ce7 100644 --- a/Instrument/CDPP-AMDA/SOHO/ERNE.xml +++ b/Instrument/CDPP-AMDA/SOHO/ERNE.xml @@ -1,6 +1,6 @@ <?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd"> - <Version>2.3.1</Version> +<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://amda.irap.omp.eu/public/schemas/spase-2_4_1.xsd"> + <Version>2.4.1</Version> <Instrument> <ResourceID>spase://CNES/Instrument/CDPP-AMDA/SOHO/ERNE</ResourceID> <ResourceHeader> diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml index ee23cc5..b377283 100644 --- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml +++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml @@ -48,7 +48,6 @@ </AccessInformation> <ProviderName>http://soar.esac.esa.int/soar</ProviderName> <ProviderResourceName>SOLO_LL02_mag</ProviderResourceName> - <ProviderAcknowlegment/> <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/MAG</InstrumentID> <MeasurementType>MagneticField</MeasurementType> <TemporalDescription> diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-density10s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-density10s.xml index ee9cc10..a7132e4 100644 --- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-density10s.xml +++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-density10s.xml @@ -39,8 +39,8 @@ Universite Paul Sabatier, Toulouse </Acknowledgement> </AccessInformation> + <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderName>SOAR</ProviderName> - <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderResourceName/> <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel> <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/RPW</InstrumentID> diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-efield10s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-efield10s.xml index 7abac25..834a123 100644 --- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-efield10s.xml +++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-efield10s.xml @@ -38,9 +38,9 @@ Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universite Paul Sabatier, Toulouse </Acknowledgement> - </AccessInformation> + </AccessInformation> + <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderName>SOAR</ProviderName> - <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderResourceName/> <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel> <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/RPW</InstrumentID> diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-scpot10s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-scpot10s.xml index 7be84ce..030b89e 100644 --- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-scpot10s.xml +++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-scpot10s.xml @@ -39,8 +39,8 @@ Universite Paul Sabatier, Toulouse </Acknowledgement> </AccessInformation> + <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderName>SOAR</ProviderName> - <ProcessingLevel>Calibrated</ProcessingLevel> <ProviderResourceName/> <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel> <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/RPW</InstrumentID> -- libgit2 0.21.2