diff --git a/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml b/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
index 613e90e..eb9dfa5 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
@@ -7,7 +7,7 @@
<ResourceName>proton 1D fit</ResourceName>
<AlternateName>STEREO PLASTIC proton parameters from 1D Maxwellian fits</AlternateName>
<ReleaseDate>2015-10-14T14:35:29Z</ReleaseDate>
- <Description>Data from ftp://stereoftp.nascom.nasa.gov. PLASTIC has a ~1 minute energy per charge (E/Q) cadence in which the electrostatic
+ <Description>Data from https://stereo-ssc.nascom.nasa.gov/pub. PLASTIC has a ~1 minute energy per charge (E/Q) cadence in which the electrostatic
analyzer (ESA) steps through 128 logarithmically spaced E/Q steps from ~80 keV/e,
down to ~0.3 keV/e.
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml b/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
index 2129b1d..201355a 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
@@ -7,7 +7,7 @@
<ResourceName>proton 1D fit</ResourceName>
<AlternateName>STEREO PLASTIC proton parameters from 1D Maxwellian fits</AlternateName>
<ReleaseDate>2018-10-14T14:44:00Z</ReleaseDate>
- <Description>Data from ftp://stereoftp.nascom.nasa.gov. PLASTIC has a ~1 minute energy per charge (E/Q) cadence in which the electrostatic
+ <Description>Data from https://stereo-ssc.nascom.nasa.gov/pub. PLASTIC has a ~1 minute energy per charge (E/Q) cadence in which the electrostatic
analyzer (ESA) steps through 128 logarithmically spaced E/Q steps from ~80 keV/e,
down to ~0.3 keV/e.
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.new.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.new.xml
deleted file mode 100644
index 1cc007d..0000000
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.new.xml
+++ /dev/null
@@ -1,131 +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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
- <Version>2.3.1</Version>
- <NumericalData>
- <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.new</ResourceID>
- <ResourceHeader>
- <ResourceName>PAS test - 3D : distribution function</ResourceName>
- <AlternateName/>
- <ReleaseDate/>
- <Description/>
- <Acknowledgement/>
- <Contact>
- <PersonID>spase://SMWG/Person/Philippe.Louarn</PersonID>
- <Role>PrincipalInvestigator</Role>
- </Contact>
- <Contact>
- <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
- <Role>PrincipalInvestigator</Role>
- </Contact>
- <InformationURL>
- <Name/>
- <URL/>
- <Description/>
- </InformationURL>
- <Association>
- <AssociationID>solo-pas-l2</AssociationID>
- <AssociationType>PartOf</AssociationType>
- <Note>L2</Note>
- </Association>
- </ResourceHeader>
- <AccessInformation>
- <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
- <Availability>Online</Availability>
- <AccessRights>Restricted</AccessRights>
- <AccessURL>
- <Name>AMDA at CDPP</Name>
- <URL>http://amda.cdpp.eu</URL>
- </AccessURL>
- <Format>NetCDF</Format>
- </AccessInformation>
- <ProviderName>IRAP</ProviderName>
- <ProviderResourceName/>
- <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/PAS</InstrumentID>
- <MeasurementType>ThermalPlasma</MeasurementType>
- <TemporalDescription>
- <TimeSpan>
- <StartDate>2017-07-07T16:22:18Z</StartDate>
- <StopDate>2019-01-17T23:16:54Z</StopDate>
- </TimeSpan>
- <Cadence>PT4S</Cadence>
- </TemporalDescription>
- <ObservedRegion>Heliosphere.Inner</ObservedRegion>
- <Parameter>
- <Name>quality factor</Name>
- <ParameterKey>pas_l2_3d_quality</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>energy : first</Name>
- <ParameterKey>pas_l2_3d_e0_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>energy : number</Name>
- <ParameterKey>pas_l2_3d_enb_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>elevation : first</Name>
- <ParameterKey>pas_l2_3d_el0_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>elevation : number</Name>
- <ParameterKey>pas_l2_3d_nbel_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>Fdis : sum on elev; azim/energy : 2D</Name>
- <ParameterKey>pas_l2_2d_elevation_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>s3 m^-6</Units>
- <RenderingHints>
- <DisplayType>Spectrogram</DisplayType>
- </RenderingHints>
- <Particle>
- <ParticleType>Ion</ParticleType>
- <ParticleQuantity>DistributionFunction</ParticleQuantity>
- </Particle>
- </Parameter>
- <Parameter>
- <Name>Fdis : sum on azim; elev/energy : 2D</Name>
- <ParameterKey>pas_l2_2d_cem_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>s3 m^-6</Units>
- <RenderingHints>
- <DisplayType>Spectrogram</DisplayType>
- </RenderingHints>
- <Particle>
- <ParticleType>Ion</ParticleType>
- <ParticleQuantity>DistributionFunction</ParticleQuantity>
- </Particle>
- </Parameter>
- <Parameter>
- <Name>Fdis : sum on energy; azim/elev : 2D</Name>
- <ParameterKey>pas_l2_2d_energy_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>s3 m^-6</Units>
- <RenderingHints>
- <DisplayType>Spectrogram</DisplayType>
- </RenderingHints>
- <Particle>
- <ParticleType>Ion</ParticleType>
- <ParticleQuantity>DistributionFunction</ParticleQuantity>
- </Particle>
- </Parameter>
- </NumericalData>
-</Spase>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
index 098a59e..1c33c2a 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
@@ -51,6 +51,13 @@
</TemporalDescription>
<ObservedRegion>Heliosphere.Inner</ObservedRegion>
<Parameter>
+ <Name>quality factor</Name>
+ <ParameterKey>pas_l2_3d_quality</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units/>
+ </Parameter>
+ <Parameter>
<Name>energy : first</Name>
<ParameterKey>pas_l2_3d_e0</ParameterKey>
<Description/>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.new.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.new.xml
deleted file mode 100644
index 9d7e75e..0000000
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.new.xml
+++ /dev/null
@@ -1,89 +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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
- <Version>2.3.1</Version>
- <NumericalData>
- <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni</ResourceID>
- <ResourceHeader>
- <ResourceName>PAS test - omni : diff E flux</ResourceName>
- <AlternateName/>
- <ReleaseDate/>
- <Description/>
- <Acknowledgement/>
- <Contact>
- <PersonID>spase://SMWG/Person/Philippe.Louarn</PersonID>
- <Role>PrincipalInvestigator</Role>
- </Contact>
- <Contact>
- <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
- <Role>PrincipalInvestigator</Role>
- </Contact>
- <InformationURL>
- <Name/>
- <URL/>
- <Description/>
- </InformationURL>
- <Association>
- <AssociationID>solo-pas-l2</AssociationID>
- <AssociationType>PartOf</AssociationType>
- <Note>L2</Note>
- </Association>
- </ResourceHeader>
- <AccessInformation>
- <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
- <Availability>Online</Availability>
- <AccessRights>Restricted</AccessRights>
- <AccessURL>
- <Name>AMDA at CDPP</Name>
- <URL>http://amda.cdpp.eu</URL>
- </AccessURL>
- <Format>NetCDF</Format>
- </AccessInformation>
- <ProviderName>IRAP</ProviderName>
- <ProviderResourceName/>
- <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/PAS</InstrumentID>
- <MeasurementType>ThermalPlasma</MeasurementType>
- <TemporalDescription>
- <TimeSpan>
- <StartDate>2017-07-07T16:22:18Z</StartDate>
- <StopDate>2019-01-17T23:16:54Z</StopDate>
- </TimeSpan>
- <Cadence>PT4S</Cadence>
- </TemporalDescription>
- <ObservedRegion>Heliosphere.Inner</ObservedRegion>
- <Parameter>
- <Name>quality factor</Name>
- <ParameterKey>pas_omni_quality</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>energy : first</Name>
- <ParameterKey>pas_omni_e0_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>energy : number</Name>
- <ParameterKey>pas_omni_enb_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units/>
- </Parameter>
- <Parameter>
- <Name>dE flux</Name>
- <ParameterKey>pas_l2_omni_new</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>cm^-2 s^-1 eV/eV</Units>
- <RenderingHints>
- <DisplayType>Spectrogram</DisplayType>
- </RenderingHints>
- <Particle>
- <ParticleType>Ion</ParticleType>
- <ParticleQuantity>EnergyFlux</ParticleQuantity>
- </Particle>
- </Parameter>
- </NumericalData>
-</Spase>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
index a86de5c..50647c7 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
@@ -51,6 +51,13 @@
</TemporalDescription>
<ObservedRegion>Heliosphere.Inner</ObservedRegion>
<Parameter>
+ <Name>quality factor</Name>
+ <ParameterKey>pas_omni_quality</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units/>
+ </Parameter>
+ <Parameter>
<Name>energy : first</Name>
<ParameterKey>pas_omni_e0</ParameterKey>
<Description/>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omnitest.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omnitest.xml
new file mode 100644
index 0000000..c7e496f
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omnitest.xml
@@ -0,0 +1,82 @@
+<?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>
+ <NumericalData>
+ <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omnitest</ResourceID>
+ <ResourceHeader>
+ <ResourceName>PAS test - omni : diff E flux</ResourceName>
+ <AlternateName/>
+ <ReleaseDate/>
+ <Description/>
+ <Acknowledgement/>
+ <Contact>
+ <PersonID>spase://SMWG/Person/Philippe.Louarn</PersonID>
+ <Role>PrincipalInvestigator</Role>
+ </Contact>
+ <Contact>
+ <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+ <Role>PrincipalInvestigator</Role>
+ </Contact>
+ <InformationURL>
+ <Name/>
+ <URL/>
+ <Description/>
+ </InformationURL>
+ <Association>
+ <AssociationID>solo-pas-l2</AssociationID>
+ <AssociationType>PartOf</AssociationType>
+ <Note>L2</Note>
+ </Association>
+ </ResourceHeader>
+ <AccessInformation>
+ <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
+ <Availability>Online</Availability>
+ <AccessRights>Restricted</AccessRights>
+ <AccessURL>
+ <Name>AMDA at CDPP</Name>
+ <URL>http://amda.cdpp.eu</URL>
+ </AccessURL>
+ <Format>NetCDF</Format>
+ </AccessInformation>
+ <ProviderName>IRAP</ProviderName>
+ <ProviderResourceName/>
+ <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/PAS</InstrumentID>
+ <MeasurementType>ThermalPlasma</MeasurementType>
+ <TemporalDescription>
+ <TimeSpan>
+ <StartDate>2017-07-07T16:22:18Z</StartDate>
+ <StopDate>2019-01-17T23:16:54Z</StopDate>
+ </TimeSpan>
+ <Cadence>PT4S</Cadence>
+ </TemporalDescription>
+ <ObservedRegion>Heliosphere.Inner</ObservedRegion>
+ <Parameter>
+ <Name>energy : first</Name>
+ <ParameterKey>pas_omnitest_e0</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units/>
+ </Parameter>
+ <Parameter>
+ <Name>energy : number</Name>
+ <ParameterKey>pas_omnitest_enb</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units/>
+ </Parameter>
+ <Parameter>
+ <Name>dE flux</Name>
+ <ParameterKey>pas_l2_omnitest</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>cm^-2 s^-1 eV/eV</Units>
+ <RenderingHints>
+ <DisplayType>Spectrogram</DisplayType>
+ </RenderingHints>
+ <Particle>
+ <ParticleType>Ion</ParticleType>
+ <ParticleQuantity>EnergyFlux</ParticleQuantity>
+ </Particle>
+ </Parameter>
+ </NumericalData>
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
index bbe6277..e899c57 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
@@ -69,14 +69,14 @@
<Description>0: Ground; 1: Normal; 2: Snapshot; 3: Burst; 4: Engineering</Description>
<Ucd/>
<Units/>
- </Parameter>
+ </Parameter>
<Parameter>
- <Name>validity</Name>
- <ParameterKey>pas_momgr1_validity</ParameterKey>
- <Description>1: V < 270 km/s; 2: V < 380 km/s; 3: V > 380 km/s</Description>
+ <Name>quality factor</Name>
+ <ParameterKey>pas_momgr1_quality</ParameterKey>
+ <Description/>
<Ucd/>
- <Units/>
- </Parameter>
+ <Units/>
+ </Parameter>
<Parameter>
<Name>density</Name>
<ParameterKey>pas_momgr_n</ParameterKey>
--
libgit2 0.21.2