CDPP / CNES

Commit 5da4da4461ad61be78a05d8622f563e27e3cfba8

Authored by Elena.Budnik
1 parent 1d5ba560
Exists in master and in 12 other branches amdadev, aschulz, autocommit, bepi_master, bepi_update, branch_q, cleanup_registry, cleanup_registry_master, cleanup_registry_merged, juice_jdc, juno_jade, soar

work

Showing 4 changed files with 101 additions and 45 deletions   Show diff stats
Inline Side-by-side
Instrument/AMDA/VEX/IMA.xml
  Diff comments   View file @5da4da4
... ... @@ -2,11 +2,11 @@
2 2 <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">
3 3 <Version>2.2.6</Version>
4 4 <Instrument>
5   - <ResourceID>spase://CDPP/Instrument/AMDA/VEX/IMA</ResourceID>
  5 + <ResourceID>spase://CDPP/Instrument/AMDA/VEX/IMA</ResourceID><!--- don't modify -->
6 6 <ResourceHeader>
7   - <ResourceName>IMA</ResourceName>
8   - <AlternateName>Ion Mass Analyzer</AlternateName>
9   - <ReleaseDate>2012-06-13T00:00:00Z</ReleaseDate>
  7 + <ResourceName>IMA</ResourceName><!-- don't modify : shown as instrument node name in the AMDA tree -->
  8 + <AlternateName>Ion Mass Analyzer</AlternateName><!-- shown in instrument tooltip in the AMDA tree -->
  9 + <ReleaseDate>2016-07-10T00:00:00Z</ReleaseDate><!--- current date -->
10 10 <Description>The Ion Mass Analyzer (IMA) of the ASPERA-4 package
11 11 flown on Venus Express provides ion measurements in the energy range
12 12 0.01 - 36 keV/q for the main ion components H+, H2+, He+, O+, and for the
... ... @@ -14,18 +14,29 @@ group of molecular ions with M/q ration between 20 and 80 amu/e. IMA has a 90 de
14 14 of view. Electrostatic sweeping performs elevation (+/- 45 deg) coverage.
15 15 The IMA sensor is a spherical electrostatic analyzer followed by a circular
16 16 magnetic separating section. A large diameter MCP with a discrete anode images
17   -the matrix azimuth x mass.</Description>
18   - <Contact>
  17 +the matrix azimuth x mass.</Description><!--- AMDA help -->
  18 + <Acknowledgement>Principal Investigator: Stas Barabash, IRF, Kiruna</Acknowledgement>
  19 + <Contact><!--- multiple tags possible -->
19 20 <PersonID>spase://SMWG/Person/Stas.Barabash</PersonID>
20 21 <Role>PrincipalInvestigator</Role>
21   - </Contact>
  22 + </Contact><!--- AMDA help -->
22 23 <InformationURL>
23   - <Name>PSA ASPERA web page</Name>
24   - <URL>ftp://psa.esac.esa.int/pub/mirror/VENUS-EXPRESS/ASPERA4/VEX-V-SW-ASPERA-2-ELS-V1.0/CATALOG/INST.CAT</URL>
  24 + <Name>ASPERA web page, IRF, Kiruna</Name><!--- AMDA help -->
  25 + <URL>http://www.irf.sw/aspera-4</URL><!--- AMDA help -->
  26 + </InformationURL>
  27 + <InformationURL>
  28 + <Name>VEX IMA/ELS Inventory Graph, IRAP, Toulouse</Name>
  29 + <URL>http://goezogt.cesr.fr/DD_VEX/inventory.html</URL>
25 30 </InformationURL>
26 31 </ResourceHeader>
27   - <InstrumentType>MassSpectrometer</InstrumentType>
28   - <InvestigationName>ASPERA4</InvestigationName>
29   - <ObservatoryID>spase://CDPP/Observatory/AMDA/VEX</ObservatoryID>
  32 + <InstrumentType>MassSpectrometer</InstrumentType><!-- shown in instrument tooltip in the AMDA tree ; multiple tags possible-->
  33 + <InvestigationName>ASPERA4</InvestigationName><!--- consortium, group of instruments, if exists -->
  34 + <OperatingSpan>
  35 + <StartDate>2006-05-14T00:00:00Z</StartDate>
  36 + <StopDate>2014-11-27T07:00:00Z</StopDate>
  37 + <Note>Data Gap : 2014-10-13T00:00:00Z - 2014-11-07T00:00:00Z</Note><!--- if possible note large data gaps; multiple Note tags -->
  38 + </OperatingSpan><!-- shown in instrument tooltip in the AMDA tree -->
  39 + <ObservatoryID>spase://CDPP/Observatory/AMDA/VEX</ObservatoryID><!--- don't modify -->
  40 + <Caveats></Caveats><!--- AMDA help, if exists -->
30 41 </Instrument>
31 42 </Spase>
... ...
NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
  Diff comments   View file @5da4da4
... ... @@ -11,7 +11,7 @@
11 11 <Acknowledgement>
12 12 </Acknowledgement>
13 13 <Contact>
14   - <PersonID>John Connerney (GSFC)</PersonID>
  14 + <PersonID>John Connerney</PersonID>
15 15 <Role>PrincipalInvestigator</Role>
16 16 </Contact>
17 17 <InformationURL>
... ... @@ -36,7 +36,9 @@
36 36 <Acknowledgement>
37 37 </Acknowledgement>
38 38 </AccessInformation>
39   - <ProviderName/>
  39 + <ProviderName>PDS</ProviderName>
  40 + <ProviderResourceName></ProviderResourceName>
  41 + <ProviderAcknowlegment></ProviderAcknowlegment>
40 42 <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/MAG</InstrumentID>
41 43 <MeasurementType>MagneticField</MeasurementType>
42 44 <TemporalDescription>
... ... @@ -44,7 +46,8 @@
44 46 <StartDate>2014-10-10T00:00:00Z</StartDate>
45 47 <StopDate>2016-02-15T00:00:02Z</StopDate>
46 48 </TimeSpan>
47   - <Cadence_Min>PT0.031S</Cadence_Min><Cadence_Max>PT8S</Cadence_Max></TemporalDescription>
  49 + <Cadence>PT0.031S</Cadence>
  50 + </TemporalDescription>
48 51 <ObservedRegion>Mars</ObservedRegion>
49 52 <Caveats>
50 53 </Caveats>
... ... @@ -131,6 +134,9 @@
131 134 <Ucd/>
132 135 <Units>nT</Units>
133 136 <UnitsConversion/>
  137 + <ValidMin/>
  138 + <ValidMax/>
  139 + <FillValue/>
134 140 </Parameter>
135 141 </NumericalData>
136 142 </Spase>
... ...
NumericalData/AMDA/VEX/IMA/vex-ima-param.xml
  Diff comments   View file @5da4da4
... ... @@ -2,18 +2,23 @@
2 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://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
3 3 <Version>2.2.6</Version>
4 4 <NumericalData>
5   - <ResourceID>spase://CDPP/NumericalData/AMDA/VEX/IMA/vex-ima-param</ResourceID>
  5 + <ResourceID>spase://CDPP/NumericalData/AMDA/VEX/IMA/vex-ima-param</ResourceID><!--- don't modify -->
6 6 <ResourceHeader>
7   - <ResourceName>imaextra moments</ResourceName>
  7 + <ResourceName>imaextra moments</ResourceName><!-- shown as dataset node name in the AMDA tree -->
8 8 <ReleaseDate>2015-10-13T17:08:00</ReleaseDate>
9 9 <Description>Venux Express (VEX) ASPERA-4 Ion Mass Analyzer (IMA) data (moments)
10   - Preliminary data obtained from Andrei Fedorov (IRAP)</Description>
  10 + Calculated using Andrei Fedorov (IRAP) procedure</Description><!--- AMDA help -->
  11 + <Acknowledgement>Principal Invistigator : Stas Barabash, IRF, Kiruna</Acknowledgement>
11 12 <Contact>
12   - <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
  13 + <PersonID>spase://SMWG/Person/Stas.Barabash</PersonID>
  14 + <Role>PrincipalInvestigator</Role>
  15 + </Contact><!--- AMDA help -->
  16 + <Contact>
  17 + <PersonID>spase://SMWG/Person/Andrey.Fedorov</PersonID>
13 18 <Role>GeneralContact</Role>
14   - </Contact>
  19 + </Contact><!--- AMDA help -->
15 20 </ResourceHeader>
16   - <AccessInformation>
  21 + <AccessInformation><!--- CDPP team to fill -->
17 22 <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
18 23 <Availability>Online</Availability>
19 24 <AccessRights>Open</AccessRights>
... ... @@ -21,40 +26,53 @@
21 26 <URL>http://amda.cdpp.eu</URL>
22 27 </AccessURL>
23 28 <Format>NetCDF</Format>
  29 + <Acknowledgement>AMDA is a science analysis system provided by the Centre de Donnees de la
  30 + Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and
  31 + Universite Paul Sabatier, Toulouse</Acknowledgement>
24 32 </AccessInformation>
25   - <ProviderName>IRAP</ProviderName>
26   - <InstrumentID>spase://CDPP/Instrument/AMDA/VEX/IMA</InstrumentID>
27   - <MeasurementType>EnergeticParticles</MeasurementType>
28   - <TemporalDescription>
  33 + <ProviderName>IRAP, Toulouse</ProviderName><!--- CDPP team to fill -->
  34 + <ProviderResourceName></ProviderResourceName><!--- CDPP team to fill -->
  35 + <ProviderAcknowlegment></ProviderAcknowlegment><!--- CDPP team to fill -->
  36 + <ProviderProcessingLevel>Final</ProviderProcessingLevel><!--- CDPP team to fill -->
  37 + <InstrumentID>spase://CDPP/Instrument/AMDA/VEX/IMA</InstrumentID><!--- don't modify -->
  38 + <MeasurementType>IonComposition</MeasurementType>
  39 + <TemporalDescription><!--- don't modify -->
29 40 <TimeSpan>
30 41 <StartDate>2006-05-14T02:58:08Z</StartDate>
31 42 <StopDate>2014-11-27T09:21:53Z</StopDate>
32 43 </TimeSpan>
33 44 <Cadence>PT192S</Cadence>
34 45 </TemporalDescription>
35   - <ObservedRegion>Venus</ObservedRegion>
  46 + <ObservedRegion>Venus</ObservedRegion><!--- First item - principal target (used in AMDA filtering) -->
  47 + <ObservedRegion>Venus.Magnetosphere</ObservedRegion>
  48 + <ObservedRegion>Heliosphere.Inner</ObservedRegion>
  49 + <Caveats></Caveats><!--- AMDA Help, if exists -->
36 50 <Parameter>
37   - <Name>protons: moments quality</Name>
38   - <ParameterKey>vex_h_qual</ParameterKey>
39   - <Description>Proton moment quality flag</Description>
  51 + <Name>protons: moments quality</Name><!-- shown as parameter name in the AMDA tree -->
  52 + <ParameterKey>vex_h_qual</ParameterKey><!--- don't modify -->
  53 + <Description>Proton moments quality flag</Description>
40 54 <Ucd>meta.code.qual;phys.atmol.ionStage</Ucd>
41   - <Units>0-1</Units>
  55 + <Units>0-1</Units><!-- shown in parameter tooltip in the AMDA tree -->
42 56 <RenderingHints>
43 57 <DisplayType>TimeSeries</DisplayType>
44 58 </RenderingHints>
  59 + <ValidMin>0</ValidMin>
  60 + <ValidMax>1</ValidMax>
45 61 <Support>
46 62 <SupportQuantity>Other</SupportQuantity>
47   - </Support>
  63 + </Support>
48 64 </Parameter>
49 65 <Parameter>
50 66 <Name>heavy: moments quality</Name>
51 67 <ParameterKey>vex_o_qual</ParameterKey>
52   - <Description>Heavy ion moment quality flag</Description>
  68 + <Description>Heavy ion moments quality flag</Description>
53 69 <Ucd>meta.code.qual;phys.atmol.ionStage</Ucd>
54 70 <Units>0-1</Units>
55 71 <RenderingHints>
56 72 <DisplayType>TimeSeries</DisplayType>
57 73 </RenderingHints>
  74 + <ValidMin>0</ValidMin>
  75 + <ValidMax>1</ValidMax>
58 76 <Support>
59 77 <SupportQuantity>Other</SupportQuantity>
60 78 </Support>
... ... @@ -68,6 +86,9 @@
68 86 <RenderingHints>
69 87 <DisplayType>TimeSeries</DisplayType>
70 88 </RenderingHints>
  89 + <ValidMin></ValidMin>
  90 + <ValidMax></ValidMax>
  91 + <FillValue></FillValue>
71 92 <Particle>
72 93 <ParticleType>Proton</ParticleType>
73 94 <ParticleQuantity>NumberDensity</ParticleQuantity>
... ... @@ -79,6 +100,8 @@
79 100 <Description>Heavy ion density</Description>
80 101 <Ucd>phys.density;phys.atmol.ionStage</Ucd>
81 102 <Units>cm-3</Units>
  103 + <UnitsConversion></UnitsConversion>
  104 +
82 105 <RenderingHints>
83 106 <DisplayType>TimeSeries</DisplayType>
84 107 </RenderingHints>
... ... @@ -105,8 +128,9 @@
105 128 <Name>heavy: temperature</Name>
106 129 <ParameterKey>vex_o_temp</ParameterKey>
107 130 <Description>Heavy ion temperature</Description>
108   - <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
  131 + <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
109 132 <Units>eV</Units>
  133 + <UnitsConversion></UnitsConversion>
110 134 <RenderingHints>
111 135 <DisplayType>TimeSeries</DisplayType>
112 136 </RenderingHints>
... ... @@ -121,31 +145,42 @@
121 145 <Description>Proton bulk velocity components in VSO coordinates</Description>
122 146 <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
123 147 <Units>km/s</Units>
  148 + <UnitsConversion></UnitsConversion>
  149 + <CoordinateSystem>
  150 + <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
  151 + <CoordinateSystemName>VSO</CoordinateSystemName>
  152 + </CoordinateSystem>
124 153 <RenderingHints>
125 154 <DisplayType>TimeSeries</DisplayType>
126   - </RenderingHints>
  155 + </RenderingHints>
127 156 <Structure>
128 157 <Size>3</Size>
129 158 <Element>
130   - <Name>vx</Name>
  159 + <Name>vx</Name><!-- shown as parameter component name in the AMDA tree -->
131 160 <Index>0</Index>
132   - <ParameterKey>vex_h_vel(0)</ParameterKey>
  161 + <ParameterKey>vex_h_vel(0)</ParameterKey><!--- don't modify -->
  162 + <ValidMin></ValidMin>
  163 + <ValidMax></ValidMax>
133 164 </Element>
134 165 <Element>
135 166 <Name>vy</Name>
136 167 <Index>1</Index>
137 168 <ParameterKey>vex_h_vel(1)</ParameterKey>
  169 + <ValidMin></ValidMin>
  170 + <ValidMax></ValidMax>
138 171 </Element>
139 172 <Element>
140 173 <Name>vz</Name>
141 174 <Index>2</Index>
142 175 <ParameterKey>vex_h_vel(2)</ParameterKey>
  176 + <ValidMin></ValidMin>
  177 + <ValidMax></ValidMax>
143 178 </Element>
144 179 </Structure>
145 180 <Particle>
146 181 <ParticleType>Proton</ParticleType>
147 182 <ParticleQuantity>Velocity</ParticleQuantity>
148   - </Particle>
  183 + </Particle>
149 184 </Parameter>
150 185 <Parameter>
151 186 <Name>heavy: v_vso</Name>
... ... @@ -153,6 +188,11 @@
153 188 <Description>Heavy ion bulk velocity components in VSO coordinates</Description>
154 189 <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
155 190 <Units>km/s</Units>
  191 + <UnitsConversion></UnitsConversion>
  192 + <CoordinateSystem>
  193 + <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
  194 + <CoordinateSystemName>VSO</CoordinateSystemName>
  195 + </CoordinateSystem>
156 196 <RenderingHints>
157 197 <DisplayType>TimeSeries</DisplayType>
158 198 </RenderingHints>
... ... @@ -182,7 +222,7 @@
182 222 <Parameter>
183 223 <Name>scan flag</Name>
184 224 <ParameterKey>vex_scan</ParameterKey>
185   - <Description>Scan quality flag</Description>
  225 + <Description>Scan flag : 0 - no scanning; 1 - scanning</Description>
186 226 <Ucd>meta.code.qual</Ucd>
187 227 <Support>
188 228 <SupportQuantity>Other</SupportQuantity>
... ...
Observatory/AMDA/VEX.xml
  Diff comments   View file @5da4da4
... ... @@ -12,14 +12,13 @@
12 12 It arrived at Venus in April 2006 and continued operating for more than eight years.
13 13 </Description><!--- AMDA help -->
14 14 <Acknowledgement>ESA</Acknowledgement><!--- AMDA help -->
15   - <Contact><!--- AMDA help (info will be get from SMWG by PersonID) -->
  15 + <Contact><!--- AMDA help (info will be get from SMWG by PersonID) ; multiple tags possible -->
16 16 <PersonID>spase://SMWG/Person/Hakan.Svedhem</PersonID>
17 17 <Role>ProjectScientist</Role>
18 18 </Contact>
19   - <InformationURL>
20   - <Name>VEX home page</Name>
21   - <URL>http://sci.esa.int/venus-express</URL><!--- AMDA help -->
22   - <Description>VEX home page at ESA</Description>
  19 + <InformationURL><!--- multiple tags possible -->
  20 + <Name>VEX home page at ESA</Name><!--- AMDA help -->
  21 + <URL>http://sci.esa.int/venus-express</URL><!--- AMDA help -->
23 22 </InformationURL>
24 23 </ResourceHeader>
25 24 <Location>
... ... @@ -29,7 +28,7 @@
29 28 <OperatingSpan><!-- shown in mission tooltip in the AMDA tree -->
30 29 <StartDate>2005-11-09T03:33:00</StartDate>
31 30 <StopDate>2014-12-16T00:00:00</StopDate>
32   - <Note>Venus arrival : 2006-04-11T00:00:00</Note><!--- Mission phases : multiple Note tags are possible -->
33   - </OperatingSpan>
  31 + <Note>Venus arrival : 2006-04-11T00:00:00</Note><!--- Mission phases : multiple Note tags possible -->
  32 + </OperatingSpan>
34 33 </Observatory>
35 34 </Spase>
... ...