Commit 4b7d95d57e89c8aa163e4480eedf7cc52d772b97

Authored by Benjamin Renard
1 parent 1bf7433c

Merge from master some modif

NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <ResourceName>proton 1D fit</ResourceName> 7 <ResourceName>proton 1D fit</ResourceName>
8 <AlternateName>STEREO PLASTIC proton parameters from 1D Maxwellian fits</AlternateName> 8 <AlternateName>STEREO PLASTIC proton parameters from 1D Maxwellian fits</AlternateName>
9 <ReleaseDate>2015-10-14T14:35:29Z</ReleaseDate> 9 <ReleaseDate>2015-10-14T14:35:29Z</ReleaseDate>
10 - <Description>Data from ftp://stereoftp.nascom.nasa.gov. PLASTIC has a ~1 minute energy per charge (E/Q) cadence in which the electrostatic 10 + <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
11 analyzer (ESA) steps through 128 logarithmically spaced E/Q steps from ~80 keV/e, 11 analyzer (ESA) steps through 128 logarithmically spaced E/Q steps from ~80 keV/e,
12 down to ~0.3 keV/e. 12 down to ~0.3 keV/e.
13 13
NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <ResourceName>proton 1D fit</ResourceName> 7 <ResourceName>proton 1D fit</ResourceName>
8 <AlternateName>STEREO PLASTIC proton parameters from 1D Maxwellian fits</AlternateName> 8 <AlternateName>STEREO PLASTIC proton parameters from 1D Maxwellian fits</AlternateName>
9 <ReleaseDate>2018-10-14T14:44:00Z</ReleaseDate> 9 <ReleaseDate>2018-10-14T14:44:00Z</ReleaseDate>
10 - <Description>Data from ftp://stereoftp.nascom.nasa.gov. PLASTIC has a ~1 minute energy per charge (E/Q) cadence in which the electrostatic 10 + <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
11 analyzer (ESA) steps through 128 logarithmically spaced E/Q steps from ~80 keV/e, 11 analyzer (ESA) steps through 128 logarithmically spaced E/Q steps from ~80 keV/e,
12 down to ~0.3 keV/e. 12 down to ~0.3 keV/e.
13 13
NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.new.xml deleted
@@ -1,131 +0,0 @@ @@ -1,131 +0,0 @@
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<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">  
3 - <Version>2.3.1</Version>  
4 - <NumericalData>  
5 - <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.new</ResourceID>  
6 - <ResourceHeader>  
7 - <ResourceName>PAS test - 3D : distribution function</ResourceName>  
8 - <AlternateName/>  
9 - <ReleaseDate/>  
10 - <Description/>  
11 - <Acknowledgement/>  
12 - <Contact>  
13 - <PersonID>spase://SMWG/Person/Philippe.Louarn</PersonID>  
14 - <Role>PrincipalInvestigator</Role>  
15 - </Contact>  
16 - <Contact>  
17 - <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>  
18 - <Role>PrincipalInvestigator</Role>  
19 - </Contact>  
20 - <InformationURL>  
21 - <Name/>  
22 - <URL/>  
23 - <Description/>  
24 - </InformationURL>  
25 - <Association>  
26 - <AssociationID>solo-pas-l2</AssociationID>  
27 - <AssociationType>PartOf</AssociationType>  
28 - <Note>L2</Note>  
29 - </Association>  
30 - </ResourceHeader>  
31 - <AccessInformation>  
32 - <RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>  
33 - <Availability>Online</Availability>  
34 - <AccessRights>Restricted</AccessRights>  
35 - <AccessURL>  
36 - <Name>AMDA at CDPP</Name>  
37 - <URL>http://amda.cdpp.eu</URL>  
38 - </AccessURL>  
39 - <Format>NetCDF</Format>  
40 - </AccessInformation>  
41 - <ProviderName>IRAP</ProviderName>  
42 - <ProviderResourceName/>  
43 - <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/PAS</InstrumentID>  
44 - <MeasurementType>ThermalPlasma</MeasurementType>  
45 - <TemporalDescription>  
46 - <TimeSpan>  
47 - <StartDate>2017-07-07T16:22:18Z</StartDate>  
48 - <StopDate>2019-01-17T23:16:54Z</StopDate>  
49 - </TimeSpan>  
50 - <Cadence>PT4S</Cadence>  
51 - </TemporalDescription>  
52 - <ObservedRegion>Heliosphere.Inner</ObservedRegion>  
53 - <Parameter>  
54 - <Name>quality factor</Name>  
55 - <ParameterKey>pas_l2_3d_quality</ParameterKey>  
56 - <Description/>  
57 - <Ucd/>  
58 - <Units/>  
59 - </Parameter>  
60 - <Parameter>  
61 - <Name>energy : first</Name>  
62 - <ParameterKey>pas_l2_3d_e0_new</ParameterKey>  
63 - <Description/>  
64 - <Ucd/>  
65 - <Units/>  
66 - </Parameter>  
67 - <Parameter>  
68 - <Name>energy : number</Name>  
69 - <ParameterKey>pas_l2_3d_enb_new</ParameterKey>  
70 - <Description/>  
71 - <Ucd/>  
72 - <Units/>  
73 - </Parameter>  
74 - <Parameter>  
75 - <Name>elevation : first</Name>  
76 - <ParameterKey>pas_l2_3d_el0_new</ParameterKey>  
77 - <Description/>  
78 - <Ucd/>  
79 - <Units/>  
80 - </Parameter>  
81 - <Parameter>  
82 - <Name>elevation : number</Name>  
83 - <ParameterKey>pas_l2_3d_nbel_new</ParameterKey>  
84 - <Description/>  
85 - <Ucd/>  
86 - <Units/>  
87 - </Parameter>  
88 - <Parameter>  
89 - <Name>Fdis : sum on elev; azim/energy : 2D</Name>  
90 - <ParameterKey>pas_l2_2d_elevation_new</ParameterKey>  
91 - <Description/>  
92 - <Ucd/>  
93 - <Units>s3 m^-6</Units>  
94 - <RenderingHints>  
95 - <DisplayType>Spectrogram</DisplayType>  
96 - </RenderingHints>  
97 - <Particle>  
98 - <ParticleType>Ion</ParticleType>  
99 - <ParticleQuantity>DistributionFunction</ParticleQuantity>  
100 - </Particle>  
101 - </Parameter>  
102 - <Parameter>  
103 - <Name>Fdis : sum on azim; elev/energy : 2D</Name>  
104 - <ParameterKey>pas_l2_2d_cem_new</ParameterKey>  
105 - <Description/>  
106 - <Ucd/>  
107 - <Units>s3 m^-6</Units>  
108 - <RenderingHints>  
109 - <DisplayType>Spectrogram</DisplayType>  
110 - </RenderingHints>  
111 - <Particle>  
112 - <ParticleType>Ion</ParticleType>  
113 - <ParticleQuantity>DistributionFunction</ParticleQuantity>  
114 - </Particle>  
115 - </Parameter>  
116 - <Parameter>  
117 - <Name>Fdis : sum on energy; azim/elev : 2D</Name>  
118 - <ParameterKey>pas_l2_2d_energy_new</ParameterKey>  
119 - <Description/>  
120 - <Ucd/>  
121 - <Units>s3 m^-6</Units>  
122 - <RenderingHints>  
123 - <DisplayType>Spectrogram</DisplayType>  
124 - </RenderingHints>  
125 - <Particle>  
126 - <ParticleType>Ion</ParticleType>  
127 - <ParticleQuantity>DistributionFunction</ParticleQuantity>  
128 - </Particle>  
129 - </Parameter>  
130 - </NumericalData>  
131 -</Spase>  
NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
@@ -51,6 +51,13 @@ @@ -51,6 +51,13 @@
51 </TemporalDescription> 51 </TemporalDescription>
52 <ObservedRegion>Heliosphere.Inner</ObservedRegion> 52 <ObservedRegion>Heliosphere.Inner</ObservedRegion>
53 <Parameter> 53 <Parameter>
  54 + <Name>quality factor</Name>
  55 + <ParameterKey>pas_l2_3d_quality</ParameterKey>
  56 + <Description/>
  57 + <Ucd/>
  58 + <Units/>
  59 + </Parameter>
  60 + <Parameter>
54 <Name>energy : first</Name> 61 <Name>energy : first</Name>
55 <ParameterKey>pas_l2_3d_e0</ParameterKey> 62 <ParameterKey>pas_l2_3d_e0</ParameterKey>
56 <Description/> 63 <Description/>
NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
@@ -51,6 +51,13 @@ @@ -51,6 +51,13 @@
51 </TemporalDescription> 51 </TemporalDescription>
52 <ObservedRegion>Heliosphere.Inner</ObservedRegion> 52 <ObservedRegion>Heliosphere.Inner</ObservedRegion>
53 <Parameter> 53 <Parameter>
  54 + <Name>quality factor</Name>
  55 + <ParameterKey>pas_omni_quality</ParameterKey>
  56 + <Description/>
  57 + <Ucd/>
  58 + <Units/>
  59 + </Parameter>
  60 + <Parameter>
54 <Name>energy : first</Name> 61 <Name>energy : first</Name>
55 <ParameterKey>pas_omni_e0</ParameterKey> 62 <ParameterKey>pas_omni_e0</ParameterKey>
56 <Description/> 63 <Description/>
NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.new.xml renamed to NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omnitest.xml
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <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"> 2 <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">
3 <Version>2.3.1</Version> 3 <Version>2.3.1</Version>
4 <NumericalData> 4 <NumericalData>
5 - <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni</ResourceID> 5 + <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omnitest</ResourceID>
6 <ResourceHeader> 6 <ResourceHeader>
7 <ResourceName>PAS test - omni : diff E flux</ResourceName> 7 <ResourceName>PAS test - omni : diff E flux</ResourceName>
8 <AlternateName/> 8 <AlternateName/>
@@ -51,29 +51,22 @@ @@ -51,29 +51,22 @@
51 </TemporalDescription> 51 </TemporalDescription>
52 <ObservedRegion>Heliosphere.Inner</ObservedRegion> 52 <ObservedRegion>Heliosphere.Inner</ObservedRegion>
53 <Parameter> 53 <Parameter>
54 - <Name>quality factor</Name>  
55 - <ParameterKey>pas_omni_quality</ParameterKey>  
56 - <Description/>  
57 - <Ucd/>  
58 - <Units/>  
59 - </Parameter>  
60 - <Parameter>  
61 <Name>energy : first</Name> 54 <Name>energy : first</Name>
62 - <ParameterKey>pas_omni_e0_new</ParameterKey> 55 + <ParameterKey>pas_omnitest_e0</ParameterKey>
63 <Description/> 56 <Description/>
64 <Ucd/> 57 <Ucd/>
65 <Units/> 58 <Units/>
66 </Parameter> 59 </Parameter>
67 <Parameter> 60 <Parameter>
68 <Name>energy : number</Name> 61 <Name>energy : number</Name>
69 - <ParameterKey>pas_omni_enb_new</ParameterKey> 62 + <ParameterKey>pas_omnitest_enb</ParameterKey>
70 <Description/> 63 <Description/>
71 <Ucd/> 64 <Ucd/>
72 <Units/> 65 <Units/>
73 </Parameter> 66 </Parameter>
74 <Parameter> 67 <Parameter>
75 <Name>dE flux</Name> 68 <Name>dE flux</Name>
76 - <ParameterKey>pas_l2_omni_new</ParameterKey> 69 + <ParameterKey>pas_l2_omnitest</ParameterKey>
77 <Description/> 70 <Description/>
78 <Ucd/> 71 <Ucd/>
79 <Units>cm^-2 s^-1 eV/eV</Units> 72 <Units>cm^-2 s^-1 eV/eV</Units>
NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
@@ -69,14 +69,14 @@ @@ -69,14 +69,14 @@
69 <Description>0: Ground; 1: Normal; 2: Snapshot; 3: Burst; 4: Engineering</Description> 69 <Description>0: Ground; 1: Normal; 2: Snapshot; 3: Burst; 4: Engineering</Description>
70 <Ucd/> 70 <Ucd/>
71 <Units/> 71 <Units/>
72 - </Parameter> 72 + </Parameter>
73 <Parameter> 73 <Parameter>
74 - <Name>validity</Name>  
75 - <ParameterKey>pas_momgr1_validity</ParameterKey>  
76 - <Description>1: V &lt; 270 km/s; 2: V &lt; 380 km/s; 3: V &gt; 380 km/s</Description> 74 + <Name>quality factor</Name>
  75 + <ParameterKey>pas_momgr1_quality</ParameterKey>
  76 + <Description/>
77 <Ucd/> 77 <Ucd/>
78 - <Units/>  
79 - </Parameter> 78 + <Units/>
  79 + </Parameter>
80 <Parameter> 80 <Parameter>
81 <Name>density</Name> 81 <Name>density</Name>
82 <ParameterKey>pas_momgr_n</ParameterKey> 82 <ParameterKey>pas_momgr_n</ParameterKey>