CDPP / CNES

Commit 8d7e37a1f44d6032f8c1e7696832a17e8c139af1

Authored by Benjamin Renard
1 parent e44a70bb
Exists in master and in 10 other branches amdadev, autocommit, bepi_master, bepi_update, cleanup_registry, cleanup_registry_master, cleanup_registry_merged, juice_jdc, juno_jade, soar

Merge DoubleStar1, ISEE, Juno & MAVEN datasets from amdadev

Showing 8 changed files with 54 additions and 62 deletions   Show diff stats
Inline Side-by-side
NumericalData/CDPP-AMDA/DoubleStar1/FGM/dstar1-fgm-prp.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -150,5 +149,5 @@
150 149 <FieldQuantity>Magnetic</FieldQuantity>
151 150 </Field>
152 151 </Parameter>
153   - </NumericalData>
154   -</Spase>
  152 + <Parameter><Name>|b|</Name><ParameterKey>dstar1_fgm_prp_bt</ParameterKey><Description>Magnetic field magnitude</Description><Ucd>phys.magField</Ucd><Units>nT</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
  153 +</Spase>
155 154 \ No newline at end of file
... ...
NumericalData/CDPP-AMDA/ISEE/ISEE1/MAG/isee1-mag-all.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -129,5 +128,5 @@ CDAWeb team at NASA/GSFC&lt;/Acknowledgement&gt;
129 128 <FieldQuantity>Magnetic</FieldQuantity>
130 129 </Field>
131 130 </Parameter>
132   - </NumericalData>
  131 + <Parameter><Name>|b|</Name><ParameterKey>isee1_mag_all_bt</ParameterKey><Description>Magnetic field magnitude</Description><Ucd>phys.magField</Ucd><Units>nT</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
133 132 </Spase>
... ...
NumericalData/CDPP-AMDA/ISEE/ISEE2/MAG/isee2-mag-all.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -122,5 +121,5 @@
122 121 <FieldQuantity>Magnetic</FieldQuantity>
123 122 </Field>
124 123 </Parameter>
125   - </NumericalData>
126   -</Spase>
  124 + <Parameter><Name>|b|</Name><ParameterKey>isee2_mag_all_bt</ParameterKey><Description>Magnetic field magnitude</Description><Ucd>phys.magField</Ucd><Units>nT</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
  125 +</Spase>
127 126 \ No newline at end of file
... ...
NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -7,7 +6,7 @@
7 6 <ResourceName>1 min</ResourceName>
8 7 <AlternateName>One minite averaged magnetic field</AlternateName>
9 8 <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
10   - <Description/>
  9 + <Description />
11 10 <Contact>
12 11 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
13 12 <Role>PrincipalInvestigator</Role>
... ... @@ -43,7 +42,7 @@
43 42 </TemporalDescription>
44 43 <ObservedRegion>Heliosphere</ObservedRegion>
45 44 <Parameter>
46   - <Name>b rtn</Name>
  45 + <Name>b_rtn</Name>
47 46 <ParameterKey>juno_fgm_cruise60_rtn</ParameterKey>
48 47 <Description>Magnetic field vector components in RTN (se) coordinates</Description>
49 48 <Ucd>phys.magField</Ucd>
... ... @@ -91,4 +90,4 @@
91 90 </Field>
92 91 </Parameter>
93 92 </NumericalData>
94 93 -</Spase>
  94 +</Spase>
95 95 \ No newline at end of file
... ...
NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -7,7 +6,7 @@
7 6 <ResourceName>1 sec</ResourceName>
8 7 <AlternateName>One second averaged magnetic field</AlternateName>
9 8 <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
10   - <Description/>
  9 + <Description />
11 10 <Contact>
12 11 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
13 12 <Role>PrincipalInvestigator</Role>
... ... @@ -43,7 +42,7 @@
43 42 </TemporalDescription>
44 43 <ObservedRegion>Jupiter</ObservedRegion>
45 44 <Parameter>
46   - <Name>b jso</Name>
  45 + <Name>b_jso</Name>
47 46 <ParameterKey>juno_fgm_orb1_jso</ParameterKey>
48 47 <Description>Magnetic field vector components in JSO (ss) coordinates</Description>
49 48 <Ucd>phys.magField</Ucd>
... ... @@ -76,7 +75,7 @@
76 75 </Field>
77 76 </Parameter>
78 77 <Parameter>
79   - <Name>b iau_jupiter</Name>
  78 + <Name>b_iau_jupiter</Name>
80 79 <ParameterKey>juno_fgm_orb1_iau</ParameterKey>
81 80 <Description>Magnetic field vector components in IAU Jupiter (pc) coordinates</Description>
82 81 <Ucd>phys.magField</Ucd>
... ... @@ -109,7 +108,7 @@
109 108 </Field>
110 109 </Parameter>
111 110 <Parameter>
112   - <Name>b pl</Name>
  111 + <Name>b_pl</Name>
113 112 <ParameterKey>juno_fgm_orb1_pl</ParameterKey>
114 113 <Description>Magnetic field vector components in pl coordinates</Description>
115 114 <Ucd>phys.magField</Ucd>
... ... @@ -157,4 +156,4 @@
157 156 </Field>
158 157 </Parameter>
159 158 </NumericalData>
160 159 -</Spase>
  160 +</Spase>
161 161 \ No newline at end of file
... ...
NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -7,7 +6,7 @@
7 6 <ResourceName>1 min</ResourceName>
8 7 <AlternateName>One minute averaged magnetic field</AlternateName>
9 8 <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
10   - <Description/>
  9 + <Description />
11 10 <Contact>
12 11 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
13 12 <Role>PrincipalInvestigator</Role>
... ... @@ -43,7 +42,7 @@
43 42 </TemporalDescription>
44 43 <ObservedRegion>Jupiter</ObservedRegion>
45 44 <Parameter>
46   - <Name>b jso</Name>
  45 + <Name>b_jso</Name>
47 46 <ParameterKey>juno_fgm_orb60_jso</ParameterKey>
48 47 <Description>Magnetic field vector components in JSO (ss) coordinates</Description>
49 48 <Ucd>phys.magField</Ucd>
... ... @@ -76,7 +75,7 @@
76 75 </Field>
77 76 </Parameter>
78 77 <Parameter>
79   - <Name>b iau_jupiter</Name>
  78 + <Name>b_iau_jupiter</Name>
80 79 <ParameterKey>juno_fgm_orb60_iau</ParameterKey>
81 80 <Description>Magnetic field vector components in IAU Jupiter (pc) coordinates</Description>
82 81 <Ucd>phys.magField</Ucd>
... ... @@ -124,4 +123,4 @@
124 123 </Field>
125 124 </Parameter>
126 125 </NumericalData>
127 126 -</Spase>
  127 +</Spase>
128 128 \ No newline at end of file
... ...
NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -7,7 +6,7 @@
7 6 <ResourceName>full</ResourceName>
8 7 <AlternateName>High resolution magnetic field</AlternateName>
9 8 <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
10   - <Description/>
  9 + <Description />
11 10 <Contact>
12 11 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
13 12 <Role>PrincipalInvestigator</Role>
... ... @@ -43,7 +42,7 @@
43 42 </TemporalDescription>
44 43 <ObservedRegion>Jupiter</ObservedRegion>
45 44 <Parameter>
46   - <Name>b jso</Name>
  45 + <Name>b_jso</Name>
47 46 <ParameterKey>juno_fgm_orbfull_jso</ParameterKey>
48 47 <Description>Magnetic field vector components in JSO (ss) coordinates</Description>
49 48 <Ucd>phys.magField</Ucd>
... ... @@ -76,7 +75,7 @@
76 75 </Field>
77 76 </Parameter>
78 77 <Parameter>
79   - <Name>b iau_jupiter</Name>
  78 + <Name>b_iau_jupiter</Name>
80 79 <ParameterKey>juno_fgm_orbfull_iau</ParameterKey>
81 80 <Description>Magnetic field vector components in IAU Jupiter (pc) coordinates</Description>
82 81 <Ucd>phys.magField</Ucd>
... ... @@ -109,7 +108,7 @@
109 108 </Field>
110 109 </Parameter>
111 110 <Parameter>
112   - <Name>b pl</Name>
  111 + <Name>b_pl</Name>
113 112 <ParameterKey>juno_fgm_orbfull_pl</ParameterKey>
114 113 <Description>Magnetic field vector components in pl coordinates</Description>
115 114 <Ucd>phys.magField</Ucd>
... ... @@ -157,4 +156,4 @@
157 156 </Field>
158 157 </Parameter>
159 158 </NumericalData>
160 159 -</Spase>
  160 +</Spase>
161 161 \ No newline at end of file
... ...
NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
  Diff comments   View file @8d7e37a
1   -<?xml version="1.0" encoding="UTF-8"?>
2 1 <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 2 <Version>2.3.1</Version>
4 3 <NumericalData>
... ... @@ -21,7 +20,7 @@
21 20 <InformationURL>
22 21 <Name>MAG web page, Summary sheet </Name>
23 22 <URL>http://lasp.colorado.edu/home/maven/science/instrument-package/mag/</URL>
24   - <Description/>
  23 + <Description />
25 24 </InformationURL>
26 25 </ResourceHeader>
27 26 <AccessInformation>
... ... @@ -50,41 +49,41 @@
50 49 <CadenceMax>PT8S</CadenceMax>
51 50 </TemporalDescription>
52 51 <ObservedRegion>Mars</ObservedRegion>
53   - <Caveats/>
  52 + <Caveats />
54 53 <Parameter>
55 54 <Name>b_mso</Name>
56 55 <ParameterKey>mav_bkp_mso</ParameterKey>
57 56 <Ucd>phys.magField</Ucd>
58 57 <Units>nT</Units>
59   - <UnitsConversion/>
  58 + <UnitsConversion />
60 59 <Structure>
61 60 <Size>3</Size>
62 61 <Element>
63 62 <Name>bx</Name>
64   - <!--Qualifier/-->
  63 +
65 64 <Index>1</Index>
66 65 <ParameterKey>mav_bkp_mso(0)</ParameterKey>
67   - <ValidMin/>
68   - <ValidMax/>
69   - <FillValue/>
  66 + <ValidMin />
  67 + <ValidMax />
  68 + <FillValue />
70 69 </Element>
71 70 <Element>
72 71 <Name>by</Name>
73   - <!--Qualifier/-->
  72 +
74 73 <Index>2</Index>
75 74 <ParameterKey>mav_bkp_mso(1)</ParameterKey>
76   - <ValidMin/>
77   - <ValidMax/>
78   - <FillValue/>
  75 + <ValidMin />
  76 + <ValidMax />
  77 + <FillValue />
79 78 </Element>
80 79 <Element>
81 80 <Name>bz</Name>
82   - <!--Qualifier/-->
  81 +
83 82 <Index>3</Index>
84 83 <ParameterKey>mav_bkp_mso(2)</ParameterKey>
85   - <ValidMin/>
86   - <ValidMax/>
87   - <FillValue/>
  84 + <ValidMin />
  85 + <ValidMax />
  86 + <FillValue />
88 87 </Element>
89 88 </Structure>
90 89 <Field>
... ... @@ -96,35 +95,35 @@
96 95 <ParameterKey>mav_bkp_iau</ParameterKey>
97 96 <Ucd>phys.magField</Ucd>
98 97 <Units>nT</Units>
99   - <UnitsConversion/>
  98 + <UnitsConversion />
100 99 <Structure>
101 100 <Size>3</Size>
102 101 <Element>
103 102 <Name>bx</Name>
104   - <!--Qualifier/-->
  103 +
105 104 <Index>1</Index>
106 105 <ParameterKey>mav_bkp_iau(0)</ParameterKey>
107   - <ValidMin/>
108   - <ValidMax/>
109   - <FillValue/>
  106 + <ValidMin />
  107 + <ValidMax />
  108 + <FillValue />
110 109 </Element>
111 110 <Element>
112 111 <Name>by</Name>
113   - <!--Qualifier/-->
  112 +
114 113 <Index>2</Index>
115 114 <ParameterKey>mav_bkp_iau(1)</ParameterKey>
116   - <ValidMin/>
117   - <ValidMax/>
118   - <FillValue/>
  115 + <ValidMin />
  116 + <ValidMax />
  117 + <FillValue />
119 118 </Element>
120 119 <Element>
121 120 <Name>bz</Name>
122   - <!--Qualifier/-->
  121 +
123 122 <Index>3</Index>
124 123 <ParameterKey>mav_bkp_iau(2)</ParameterKey>
125   - <ValidMin/>
126   - <ValidMax/>
127   - <FillValue/>
  124 + <ValidMin />
  125 + <ValidMax />
  126 + <FillValue />
128 127 </Element>
129 128 </Structure>
130 129 <Field>
... ... @@ -136,21 +135,21 @@
136 135 <ParameterKey>mav_bkp_tot</ParameterKey>
137 136 <Ucd>phys.magField</Ucd>
138 137 <Units>nT</Units>
139   - <UnitsConversion/>
  138 + <UnitsConversion />
140 139 <Field>
141 140 <FieldQuantity>Magnetic</FieldQuantity>
142 141 </Field>
143 142 </Parameter>
144 143 <Parameter>
145   - <Name>b rms</Name>
  144 + <Name>b_rms</Name>
146 145 <ParameterKey>mav_bkp_rms</ParameterKey>
147 146 <Description>Deviations from the mean magnitude of the magnetic field</Description>
148 147 <Ucd>phys.magField</Ucd>
149 148 <Units>nT</Units>
150   - <UnitsConversion/>
  149 + <UnitsConversion />
151 150 <Field>
152 151 <FieldQuantity>Magnetic</FieldQuantity>
153 152 </Field>
154 153 </Parameter>
155 154 </NumericalData>
156 155 -</Spase>
  156 +</Spase>
157 157 \ No newline at end of file
... ...