CDPP / CNES

Commit 2d77f79c7f2b2743e0f4753edc3545337e17601f

Authored by Elena.Budnik
1 parent 53e842a1
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 3 changed files with 51 additions and 51 deletions   Show diff stats
Inline Side-by-side
NumericalData/AMDA/Cassini/CAPS/cass-caps-ionmo.xml
  Diff comments   View file @2d77f79
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </TemporalDescription> 37 </TemporalDescription>
38 <ObservedRegion>Saturn</ObservedRegion> 38 <ObservedRegion>Saturn</ObservedRegion>
39 <Parameter> 39 <Parameter>
40 - <Name>ion method flag</Name> 40 + <Name>method flag</Name>
41 <ParameterKey>cass_caps_imethod</ParameterKey> 41 <ParameterKey>cass_caps_imethod</ParameterKey>
42 <Ucd>meta.code.error;stat.fit</Ucd> 42 <Ucd>meta.code.error;stat.fit</Ucd>
43 <RenderingHints> 43 <RenderingHints>
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 </Support> 48 </Support>
49 </Parameter> 49 </Parameter>
50 <Parameter> 50 <Parameter>
51 - <Name>H+ density</Name> 51 + <Name>density h+</Name>
52 <ParameterKey>cass_caps_n_p</ParameterKey> 52 <ParameterKey>cass_caps_n_p</ParameterKey>
53 <Ucd>phys.density;phys.atmol.ionStage</Ucd> 53 <Ucd>phys.density;phys.atmol.ionStage</Ucd>
54 <Units>cm-3</Units> 54 <Units>cm-3</Units>
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 </Particle> 61 </Particle>
62 </Parameter> 62 </Parameter>
63 <Parameter> 63 <Parameter>
64 - <Name>H+ temperature</Name> 64 + <Name>temperature h+</Name>
65 <ParameterKey>cass_caps_t_p</ParameterKey> 65 <ParameterKey>cass_caps_t_p</ParameterKey>
66 <Ucd>phys.temperature;phys.atmol.ionStage</Ucd> 66 <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
67 <Units>eV</Units> 67 <Units>eV</Units>
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 </Particle> 74 </Particle>
75 </Parameter> 75 </Parameter>
76 <Parameter> 76 <Parameter>
77 - <Name>He2+ density</Name> 77 + <Name>density he2+</Name>
78 <ParameterKey>cass_caps_n_he</ParameterKey> 78 <ParameterKey>cass_caps_n_he</ParameterKey>
79 <Ucd>phys.density;phys.atmol.ionStage</Ucd> 79 <Ucd>phys.density;phys.atmol.ionStage</Ucd>
80 <Units>cm-3</Units> 80 <Units>cm-3</Units>
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 </Particle> 87 </Particle>
88 </Parameter> 88 </Parameter>
89 <Parameter> 89 <Parameter>
90 - <Name>He2+ temperature</Name> 90 + <Name>temperature he2+</Name>
91 <ParameterKey>cass_caps_t_he</ParameterKey> 91 <ParameterKey>cass_caps_t_he</ParameterKey>
92 <Ucd>phys.temperature;phys.atmol.ionStage</Ucd> 92 <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
93 <Units>eV</Units> 93 <Units>eV</Units>
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 </Particle> 100 </Particle>
101 </Parameter> 101 </Parameter>
102 <Parameter> 102 <Parameter>
103 - <Name>Water group density</Name> 103 + <Name>density h2o group</Name>
104 <ParameterKey>cass_caps_w_n</ParameterKey> 104 <ParameterKey>cass_caps_w_n</ParameterKey>
105 <Ucd>phys.density;phys.atmol.ionStage</Ucd> 105 <Ucd>phys.density;phys.atmol.ionStage</Ucd>
106 <Units>cm-3</Units> 106 <Units>cm-3</Units>
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 </Particle> 113 </Particle>
114 </Parameter> 114 </Parameter>
115 <Parameter> 115 <Parameter>
116 - <Name>Water group temperature</Name> 116 + <Name>temperature h2o group</Name>
117 <ParameterKey>cass_caps_w_t</ParameterKey> 117 <ParameterKey>cass_caps_w_t</ParameterKey>
118 <Ucd>phys.temperature;phys.atmol.ionStage</Ucd> 118 <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
119 <Units>eV</Units> 119 <Units>eV</Units>
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </Particle> 126 </Particle>
127 </Parameter> 127 </Parameter>
128 <Parameter> 128 <Parameter>
129 - <Name>speed (KRTP)</Name> 129 + <Name>v_krtp</Name>
130 <ParameterKey>cass_caps_v_ion</ParameterKey> 130 <ParameterKey>cass_caps_v_ion</ParameterKey>
131 <Ucd>phys.veloc;phys.atmol.ionStage</Ucd> 131 <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
132 <Units>km/s</Units> 132 <Units>km/s</Units>
@@ -157,7 +157,7 @@ @@ -157,7 +157,7 @@
157 </Particle> 157 </Particle>
158 </Parameter> 158 </Parameter>
159 <Parameter> 159 <Parameter>
160 - <Name>flow speed</Name> 160 + <Name>v_bulk</Name>
161 <ParameterKey>cass_caps_vmag_ion</ParameterKey> 161 <ParameterKey>cass_caps_vmag_ion</ParameterKey>
162 <Ucd>phys.veloc;phys.atmol.ionStage</Ucd> 162 <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
163 <Units>km/s</Units> 163 <Units>km/s</Units>
NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
  Diff comments   View file @2d77f79
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <NumericalData> 4 <NumericalData>
5 <ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise</ResourceID> 5 <ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-cruise</ResourceID>
6 <ResourceHeader> 6 <ResourceHeader>
7 - <ResourceName>orbit</ResourceName> 7 + <ResourceName>cruise</ResourceName>
8 <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate> 8 <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
9 <Description> 9 <Description>
10 </Description> 10 </Description>
@@ -32,11 +32,11 @@ @@ -32,11 +32,11 @@
32 http://amda.cdpp.eu 32 http://amda.cdpp.eu
33 </URL> 33 </URL>
34 </AccessURL> 34 </AccessURL>
35 - <Format/> 35 + <Format>Text</Format>
36 <Acknowledgement> 36 <Acknowledgement>
37 </Acknowledgement> 37 </Acknowledgement>
38 </AccessInformation> 38 </AccessInformation>
39 - <ProviderName/> 39 + <ProviderName>SPICE/NAIF</ProviderName>
40 <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID> 40 <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID>
41 <MeasurementType/> 41 <MeasurementType/>
42 <TemporalDescription> 42 <TemporalDescription>
@@ -44,14 +44,14 @@ @@ -44,14 +44,14 @@
44 <StartDate>2013-11-18T19:21:49Z</StartDate> 44 <StartDate>2013-11-18T19:21:49Z</StartDate>
45 <StopDate>2014-09-21T22:21:49Z</StopDate> 45 <StopDate>2014-09-21T22:21:49Z</StopDate>
46 </TimeSpan> 46 </TimeSpan>
47 - <Cadence/> 47 + <Cadence>PT1H</Cadence>
48 </TemporalDescription> 48 </TemporalDescription>
49 - <ObservedRegion/> 49 + <ObservedRegion>Heliosphere</ObservedRegion>
50 <Caveats> 50 <Caveats>
51 </Caveats> 51 </Caveats>
52 <Parameter> 52 <Parameter>
53 - <Name>xyz iausun</Name>  
54 - <ParameterKey>maven_orb_iausun</ParameterKey> 53 + <Name>xyz_iau_sun</Name>
  54 + <ParameterKey>mav_xyz_iausun</ParameterKey>
55 <Description/> 55 <Description/>
56 <Ucd/> 56 <Ucd/>
57 <Units/> 57 <Units/>
@@ -64,17 +64,17 @@ @@ -64,17 +64,17 @@
64 <Element> 64 <Element>
65 <Name>x</Name> 65 <Name>x</Name>
66 <Index>0</Index> 66 <Index>0</Index>
67 - <ParameterKey>maven_orb_iausun(0)</ParameterKey> 67 + <ParameterKey>mav_xyz_iausun(0)</ParameterKey>
68 </Element> 68 </Element>
69 <Element> 69 <Element>
70 <Name>y</Name> 70 <Name>y</Name>
71 <Index>1</Index> 71 <Index>1</Index>
72 - <ParameterKey>maven_orb_iausun(1)</ParameterKey> 72 + <ParameterKey>mav_xyz_iausun(1)</ParameterKey>
73 </Element> 73 </Element>
74 <Element> 74 <Element>
75 <Name>z</Name> 75 <Name>z</Name>
76 <Index>2</Index> 76 <Index>2</Index>
77 - <ParameterKey>maven_orb_iausun(2)</ParameterKey> 77 + <ParameterKey>mav_xyz_iausun(2)</ParameterKey>
78 </Element> 78 </Element>
79 </Structure> 79 </Structure>
80 <ValidMin/> 80 <ValidMin/>
@@ -82,8 +82,8 @@ @@ -82,8 +82,8 @@
82 <FillValue/> 82 <FillValue/>
83 </Parameter> 83 </Parameter>
84 <Parameter> 84 <Parameter>
85 - <Name>xyz hee</Name>  
86 - <ParameterKey>maven_orb_hee</ParameterKey> 85 + <Name>xyz_hee</Name>
  86 + <ParameterKey>mav_xyz_hee</ParameterKey>
87 <Description/> 87 <Description/>
88 <Ucd/> 88 <Ucd/>
89 <Units/> 89 <Units/>
@@ -96,17 +96,17 @@ @@ -96,17 +96,17 @@
96 <Element> 96 <Element>
97 <Name>x</Name> 97 <Name>x</Name>
98 <Index>0</Index> 98 <Index>0</Index>
99 - <ParameterKey>maven_orb_hee(0)</ParameterKey> 99 + <ParameterKey>mav_xyz_hee(0)</ParameterKey>
100 </Element> 100 </Element>
101 <Element> 101 <Element>
102 <Name>y</Name> 102 <Name>y</Name>
103 <Index>1</Index> 103 <Index>1</Index>
104 - <ParameterKey>maven_orb_hee(1)</ParameterKey> 104 + <ParameterKey>mav_xyz_hee(1)</ParameterKey>
105 </Element> 105 </Element>
106 <Element> 106 <Element>
107 <Name>z</Name> 107 <Name>z</Name>
108 <Index>2</Index> 108 <Index>2</Index>
109 - <ParameterKey>maven_orb_hee(2)</ParameterKey> 109 + <ParameterKey>mav_xyz_hee(2)</ParameterKey>
110 </Element> 110 </Element>
111 </Structure> 111 </Structure>
112 <ValidMin/> 112 <ValidMin/>
@@ -114,8 +114,8 @@ @@ -114,8 +114,8 @@
114 <FillValue/> 114 <FillValue/>
115 </Parameter> 115 </Parameter>
116 <Parameter> 116 <Parameter>
117 - <Name>xyz heeq</Name>  
118 - <ParameterKey>maven_orb_heeq</ParameterKey> 117 + <Name>xyz_heeq</Name>
  118 + <ParameterKey>mav_xyz_heeq</ParameterKey>
119 <Description/> 119 <Description/>
120 <Ucd/> 120 <Ucd/>
121 <Units/> 121 <Units/>
@@ -128,17 +128,17 @@ @@ -128,17 +128,17 @@
128 <Element> 128 <Element>
129 <Name>x</Name> 129 <Name>x</Name>
130 <Index>0</Index> 130 <Index>0</Index>
131 - <ParameterKey>maven_orb_heeq(0)</ParameterKey> 131 + <ParameterKey>mav_xyz_heeq(0)</ParameterKey>
132 </Element> 132 </Element>
133 <Element> 133 <Element>
134 <Name>y</Name> 134 <Name>y</Name>
135 <Index>1</Index> 135 <Index>1</Index>
136 - <ParameterKey>maven_orb_heeq(1)</ParameterKey> 136 + <ParameterKey>mav_xyz_heeq(1)</ParameterKey>
137 </Element> 137 </Element>
138 <Element> 138 <Element>
139 <Name>z</Name> 139 <Name>z</Name>
140 <Index>2</Index> 140 <Index>2</Index>
141 - <ParameterKey>maven_orb_heeq(2)</ParameterKey> 141 + <ParameterKey>mav_xyz_heeq(2)</ParameterKey>
142 </Element> 142 </Element>
143 </Structure> 143 </Structure>
144 <ValidMin/> 144 <ValidMin/>
@@ -146,8 +146,8 @@ @@ -146,8 +146,8 @@
146 <FillValue/> 146 <FillValue/>
147 </Parameter> 147 </Parameter>
148 <Parameter> 148 <Parameter>
149 - <Name>r_iau_sun</Name>  
150 - <ParameterKey>maven_orb_r</ParameterKey> 149 + <Name>distance maven-sun</Name>
  150 + <ParameterKey>mav_sun_r</ParameterKey>
151 <Description/> 151 <Description/>
152 <Ucd/> 152 <Ucd/>
153 <Units/> 153 <Units/>
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 </Parameter> 158 </Parameter>
159 <Parameter> 159 <Parameter>
160 <Name>lon_iau_sun</Name> 160 <Name>lon_iau_sun</Name>
161 - <ParameterKey>maven_orb_lon_iausun</ParameterKey> 161 + <ParameterKey>mav_lon_iausun</ParameterKey>
162 <Description/> 162 <Description/>
163 <Ucd/> 163 <Ucd/>
164 <Units/> 164 <Units/>
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@
169 </Parameter> 169 </Parameter>
170 <Parameter> 170 <Parameter>
171 <Name>lat_iau_sun</Name> 171 <Name>lat_iau_sun</Name>
172 - <ParameterKey>maven_orb_lat_iausun</ParameterKey> 172 + <ParameterKey>mav_lat_iausun</ParameterKey>
173 <Description/> 173 <Description/>
174 <Ucd/> 174 <Ucd/>
175 <Units/> 175 <Units/>
NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
  Diff comments   View file @2d77f79
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <NumericalData> 4 <NumericalData>
5 <ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/mav-orb-marsobs</ResourceID> 5 <ResourceID>spase://CDPP/NumericalData/AMDA/MAVEN/Ephemeris/mav-orb-marsobs</ResourceID>
6 <ResourceHeader> 6 <ResourceHeader>
7 - <ResourceName>orbit</ResourceName> 7 + <ResourceName>orbit mars</ResourceName>
8 <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate> 8 <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
9 <Description> 9 <Description>
10 </Description> 10 </Description>
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <Acknowledgement> 36 <Acknowledgement>
37 </Acknowledgement> 37 </Acknowledgement>
38 </AccessInformation> 38 </AccessInformation>
39 - <ProviderName/> 39 + <ProviderName>SPICE/NAIF</ProviderName>
40 <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID> 40 <InstrumentID>spase://CDPP/Instrument/AMDA/MAVEN/Ephemeris</InstrumentID>
41 <MeasurementType/> 41 <MeasurementType/>
42 <TemporalDescription> 42 <TemporalDescription>
@@ -44,14 +44,14 @@ @@ -44,14 +44,14 @@
44 <StartDate>2014-06-01T00:00:00Z</StartDate> 44 <StartDate>2014-06-01T00:00:00Z</StartDate>
45 <StopDate>2015-12-15T16:56:59Z</StopDate> 45 <StopDate>2015-12-15T16:56:59Z</StopDate>
46 </TimeSpan> 46 </TimeSpan>
47 - <Cadence/> 47 + <Cadence>PT1M</Cadence>
48 </TemporalDescription> 48 </TemporalDescription>
49 - <ObservedRegion/> 49 + <ObservedRegion>Mars</ObservedRegion>
50 <Caveats> 50 <Caveats>
51 </Caveats> 51 </Caveats>
52 <Parameter> 52 <Parameter>
53 - <Name>xyz iaumars</Name>  
54 - <ParameterKey>maven_orb_iaumars</ParameterKey> 53 + <Name>xyz_iau_mars</Name>
  54 + <ParameterKey>mav_xyz_iaumars</ParameterKey>
55 <Description/> 55 <Description/>
56 <Ucd/> 56 <Ucd/>
57 <Units/> 57 <Units/>
@@ -64,17 +64,17 @@ @@ -64,17 +64,17 @@
64 <Element> 64 <Element>
65 <Name>x</Name> 65 <Name>x</Name>
66 <Index>0</Index> 66 <Index>0</Index>
67 - <ParameterKey>maven_orb_iaumars(0)</ParameterKey> 67 + <ParameterKey>mav_xyz_iaumars(0)</ParameterKey>
68 </Element> 68 </Element>
69 <Element> 69 <Element>
70 <Name>y</Name> 70 <Name>y</Name>
71 <Index>1</Index> 71 <Index>1</Index>
72 - <ParameterKey>maven_orb_iaumars(1)</ParameterKey> 72 + <ParameterKey>mav_xyz_iaumars(1)</ParameterKey>
73 </Element> 73 </Element>
74 <Element> 74 <Element>
75 <Name>z</Name> 75 <Name>z</Name>
76 <Index>2</Index> 76 <Index>2</Index>
77 - <ParameterKey>maven_orb_iaumars(2)</ParameterKey> 77 + <ParameterKey>mav_xyz_iaumars(2)</ParameterKey>
78 </Element> 78 </Element>
79 </Structure> 79 </Structure>
80 <ValidMin/> 80 <ValidMin/>
@@ -82,8 +82,8 @@ @@ -82,8 +82,8 @@
82 <FillValue/> 82 <FillValue/>
83 </Parameter> 83 </Parameter>
84 <Parameter> 84 <Parameter>
85 - <Name>xyz hee</Name>  
86 - <ParameterKey>maven_marsobs_mso</ParameterKey> 85 + <Name>xyz_mso</Name>
  86 + <ParameterKey>mav_xyz_mso</ParameterKey>
87 <Description/> 87 <Description/>
88 <Ucd/> 88 <Ucd/>
89 <Units/> 89 <Units/>
@@ -96,17 +96,17 @@ @@ -96,17 +96,17 @@
96 <Element> 96 <Element>
97 <Name>x</Name> 97 <Name>x</Name>
98 <Index>0</Index> 98 <Index>0</Index>
99 - <ParameterKey>maven_marsobs_mso(0)</ParameterKey> 99 + <ParameterKey>mav_xyz_mso(0)</ParameterKey>
100 </Element> 100 </Element>
101 <Element> 101 <Element>
102 <Name>y</Name> 102 <Name>y</Name>
103 <Index>1</Index> 103 <Index>1</Index>
104 - <ParameterKey>maven_marsobs_mso(1)</ParameterKey> 104 + <ParameterKey>mav_xyz_mso(1)</ParameterKey>
105 </Element> 105 </Element>
106 <Element> 106 <Element>
107 <Name>z</Name> 107 <Name>z</Name>
108 <Index>2</Index> 108 <Index>2</Index>
109 - <ParameterKey>maven_marsobs_mso(2)</ParameterKey> 109 + <ParameterKey>mav_xyz_mso(2)</ParameterKey>
110 </Element> 110 </Element>
111 </Structure> 111 </Structure>
112 <ValidMin/> 112 <ValidMin/>
@@ -114,8 +114,8 @@ @@ -114,8 +114,8 @@
114 <FillValue/> 114 <FillValue/>
115 </Parameter> 115 </Parameter>
116 <Parameter> 116 <Parameter>
117 - <Name>r_iau_mars</Name>  
118 - <ParameterKey>maven_marsobs_r</ParameterKey> 117 + <Name>distance maven-mars</Name>
  118 + <ParameterKey>mav_mars_r</ParameterKey>
119 <Description/> 119 <Description/>
120 <Ucd/> 120 <Ucd/>
121 <Units/> 121 <Units/>
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </Parameter> 126 </Parameter>
127 <Parameter> 127 <Parameter>
128 <Name>lon_iau_mars</Name> 128 <Name>lon_iau_mars</Name>
129 - <ParameterKey>maven_marsobs_lon_iaumars</ParameterKey> 129 + <ParameterKey>mav_lon_iaumars</ParameterKey>
130 <Description/> 130 <Description/>
131 <Ucd/> 131 <Ucd/>
132 <Units/> 132 <Units/>
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 </Parameter> 137 </Parameter>
138 <Parameter> 138 <Parameter>
139 <Name>lat_iau_mars</Name> 139 <Name>lat_iau_mars</Name>
140 - <ParameterKey>maven_marsobs_lat_iaumars</ParameterKey> 140 + <ParameterKey>mav_lat_iaumars</ParameterKey>
141 <Description/> 141 <Description/>
142 <Ucd/> 142 <Ucd/>
143 <Units/> 143 <Units/>