Commit 4c67cec22441bc74dd031e4dc4b1f5e46118e52e

Authored by Benjamin Renard
1 parent e59bb47e
Exists in master

Merge PSP/SPI/MOM/v_rtn from amdadev into master

NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-Hmom.xml
@@ -156,98 +156,6 @@ @@ -156,98 +156,6 @@
156 <ParticleQuantity>Temperature</ParticleQuantity> 156 <ParticleQuantity>Temperature</ParticleQuantity>
157 </Particle> 157 </Particle>
158 </Parameter> 158 </Parameter>
159 - <!-- <Parameter>  
160 - <Name>h+ t_rtn</Name>  
161 - <ParameterKey>psp_spi_Hwt</ParameterKey>  
162 - <Description>Temperature Tensor in RTN frame</Description>  
163 - <Units>eV</Units>  
164 - <CoordinateSystem>  
165 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
166 - <CoordinateSystemName>RTN</CoordinateSystemName>  
167 - </CoordinateSystem>  
168 - <RenderingHints>  
169 - <DisplayType>TimeSeries</DisplayType>  
170 - </RenderingHints>  
171 - <Structure>  
172 - <Size>6</Size>  
173 - <Element>  
174 - <Name>Txx</Name>  
175 - <Index>1</Index>  
176 - <ParameterKey>psp_spi_Hwt(0)</ParameterKey>  
177 - </Element>  
178 - <Element>  
179 - <Name>Tyy</Name>  
180 - <Index>2</Index>  
181 - <ParameterKey>psp_spi_Hwt(1)</ParameterKey>  
182 - </Element>  
183 - <Element>  
184 - <Name>Tzz</Name>  
185 - <Index>3</Index>  
186 - <ParameterKey>psp_spi_Hwt(2)</ParameterKey>  
187 - </Element>  
188 - <Element>  
189 - <Name>Txy</Name>  
190 - <Index>4</Index>  
191 - <ParameterKey>psp_spi_Hwt(3)</ParameterKey>  
192 - </Element>  
193 - <Element>  
194 - <Name>Txz</Name>  
195 - <Index>5</Index>  
196 - <ParameterKey>psp_spi_Hwt(4)</ParameterKey>  
197 - </Element>  
198 - <Element>  
199 - <Name>Tyz</Name>  
200 - <Index>6</Index>  
201 - <ParameterKey>psp_spi_Hwt(5)</ParameterKey>  
202 - </Element>  
203 - </Structure>  
204 - </Parameter>  
205 - <Parameter>  
206 - <Name>h+ t_sc</Name>  
207 - <ParameterKey>psp_spi_Hwt_sc</ParameterKey>  
208 - <Description>Temperature Tensor in SC frame</Description>  
209 - <Units>eV</Units>  
210 - <CoordinateSystem>  
211 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
212 - <CoordinateSystemName>SC</CoordinateSystemName>  
213 - </CoordinateSystem>  
214 - <RenderingHints>  
215 - <DisplayType>TimeSeries</DisplayType>  
216 - </RenderingHints>  
217 - <Structure>  
218 - <Size>6</Size>  
219 - <Element>  
220 - <Name>Txx</Name>  
221 - <Index>1</Index>  
222 - <ParameterKey>psp_spi_Hwt_sc(0)</ParameterKey>  
223 - </Element>  
224 - <Element>  
225 - <Name>Tyy</Name>  
226 - <Index>2</Index>  
227 - <ParameterKey>psp_spi_Hwt_sc(1)</ParameterKey>  
228 - </Element>  
229 - <Element>  
230 - <Name>Tzz</Name>  
231 - <Index>3</Index>  
232 - <ParameterKey>psp_spi_Hwt_sc(2)</ParameterKey>  
233 - </Element>  
234 - <Element>  
235 - <Name>Txy</Name>  
236 - <Index>4</Index>  
237 - <ParameterKey>psp_spi_Hwt_sc(3)</ParameterKey>  
238 - </Element>  
239 - <Element>  
240 - <Name>Txz</Name>  
241 - <Index>5</Index>  
242 - <ParameterKey>psp_spi_Hwt_sc(4)</ParameterKey>  
243 - </Element>  
244 - <Element>  
245 - <Name>Tyz</Name>  
246 - <Index>6</Index>  
247 - <ParameterKey>psp_spi_Hwt_sc(5)</ParameterKey>  
248 - </Element>  
249 - </Structure>  
250 - </Parameter> -->  
251 <Parameter> 159 <Parameter>
252 <Name>h+ v_inst</Name> 160 <Name>h+ v_inst</Name>
253 <ParameterKey>psp_spi_Hv_inst</ParameterKey> 161 <ParameterKey>psp_spi_Hv_inst</ParameterKey>
@@ -283,73 +191,44 @@ @@ -283,73 +191,44 @@
283 <ParticleQuantity>Velocity</ParticleQuantity> 191 <ParticleQuantity>Velocity</ParticleQuantity>
284 </Particle> 192 </Particle>
285 </Parameter> 193 </Parameter>
286 - <!-- <Parameter>  
287 - <Name>h+ v_rtn</Name>  
288 - <ParameterKey>psp_spi_Hv</ParameterKey>  
289 - <Description>Particle Velocity in RTN frame</Description>  
290 - <Units>km/s</Units>  
291 - <CoordinateSystem>  
292 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
293 - <CoordinateSystemName>RTN</CoordinateSystemName>  
294 - </CoordinateSystem>  
295 - <RenderingHints>  
296 - <DisplayType>TimeSeries</DisplayType>  
297 - </RenderingHints>  
298 - <Structure>  
299 - <Size>3</Size>  
300 - <Element>  
301 - <Name>vr</Name>  
302 - <Qualifier>Component.I</Qualifier>  
303 - <Index>1</Index>  
304 - <ParameterKey>psp_spi_Hv(0)</ParameterKey>  
305 - </Element>  
306 - <Element>  
307 - <Name>vt</Name>  
308 - <Qualifier>Component.J</Qualifier>  
309 - <Index>2</Index>  
310 - <ParameterKey>psp_spi_Hv(1)</ParameterKey>  
311 - </Element>  
312 - <Element>  
313 - <Name>vn</Name>  
314 - <Qualifier>Component.K</Qualifier>  
315 - <Index>3</Index>  
316 - <ParameterKey>psp_spc_Hv(2)</ParameterKey>  
317 - </Element>  
318 - </Structure>  
319 - </Parameter>  
320 - <Parameter>  
321 - <Name>h+ v_sc</Name>  
322 - <ParameterKey>psp_spi_Hv_sc</ParameterKey>  
323 - <Description>Particle Velocity in SC frame</Description>  
324 - <Units>km/s</Units>  
325 - <CoordinateSystem>  
326 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
327 - <CoordinateSystemName>SC</CoordinateSystemName>  
328 - </CoordinateSystem>  
329 - <RenderingHints>  
330 - <DisplayType>TimeSeries</DisplayType>  
331 - </RenderingHints>  
332 - <Structure>  
333 - <Size>3</Size>  
334 - <Element>  
335 - <Name>vx</Name>  
336 - <Qualifier>Component.I</Qualifier>  
337 - <Index>1</Index>  
338 - <ParameterKey>psp_spi_Hv_sc(0)</ParameterKey>  
339 - </Element>  
340 - <Element>  
341 - <Name>vy</Name>  
342 - <Qualifier>Component.J</Qualifier>  
343 - <Index>2</Index>  
344 - <ParameterKey>psp_spi_Hv_sc(1)</ParameterKey>  
345 - </Element>  
346 - <Element>  
347 - <Name>vz</Name>  
348 - <Qualifier>Component.K</Qualifier>  
349 - <Index>3</Index>  
350 - <ParameterKey>psp_spc_Hv_sc(2)</ParameterKey>  
351 - </Element>  
352 - </Structure>  
353 - </Parameter> --> 194 + <Parameter>
  195 + <Name>h+ v_rtn</Name>
  196 + <ParameterKey>psp_spi_Hv</ParameterKey>
  197 + <Description>Particle Velocity in RTN frame</Description>
  198 + <Units>km/s</Units>
  199 + <CoordinateSystem>
  200 + <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
  201 + <CoordinateSystemName>RTN</CoordinateSystemName>
  202 + </CoordinateSystem>
  203 + <RenderingHints>
  204 + <DisplayType>TimeSeries</DisplayType>
  205 + </RenderingHints>
  206 + <Structure>
  207 + <Size>3</Size>
  208 + <Element>
  209 + <Name>vr</Name>
  210 + <Qualifier>Component.I</Qualifier>
  211 + <Index>1</Index>
  212 + <ParameterKey>psp_spi_Hv(0)</ParameterKey>
  213 + </Element>
  214 + <Element>
  215 + <Name>vt</Name>
  216 + <Qualifier>Component.J</Qualifier>
  217 + <Index>2</Index>
  218 + <ParameterKey>psp_spi_Hv(1)</ParameterKey>
  219 + </Element>
  220 + <Element>
  221 + <Name>vn</Name>
  222 + <Qualifier>Component.K</Qualifier>
  223 + <Index>3</Index>
  224 + <ParameterKey>psp_spi_Hv(2)</ParameterKey>
  225 + </Element>
  226 + </Structure>
  227 + <Particle>
  228 + <ParticleType>Ion</ParticleType>
  229 + <Qualifier>Vector</Qualifier>
  230 + <ParticleQuantity>Velocity</ParticleQuantity>
  231 + </Particle>
  232 + </Parameter>
354 </NumericalData> 233 </NumericalData>
355 </Spase> 234 </Spase>
NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-amom.xml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <AlternateName>SWEAP SPAN-Ai Level 3 moments</AlternateName> 8 <AlternateName>SWEAP SPAN-Ai Level 3 moments</AlternateName>
9 <ReleaseDate>2021-11-22T04:14:32Z</ReleaseDate> 9 <ReleaseDate>2021-11-22T04:14:32Z</ReleaseDate>
10 <Description> 10 <Description>
11 - This data product contains Partial moments of the Alpha distribution function in the RTN frame of reference. User should be aware that the full ion distribution is typically not in the field of view of the instrument. 11 + This data product contains Partial moments of the Alpha distribution function in the SPAN-Ion instrument, PSP spacecraft, and RTN coordinate systems. User should be aware that the full ion distribution is typically NOT in the FOV of the instrument.
12 </Description> 12 </Description>
13 <Acknowledgement> 13 <Acknowledgement>
14 Please acknowledge the NASA Parker Solar Probe Mission and SWEAP team 14 Please acknowledge the NASA Parker Solar Probe Mission and SWEAP team
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donnรฉes de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universitรฉ Paul Sabatier, Toulouse". See the Rules of the road at https://amda.cdpp.eu/help/policy.html . Please acknowledge the Data Providers.</Acknowledgement> 65 <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donnรฉes de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universitรฉ Paul Sabatier, Toulouse". See the Rules of the road at https://amda.cdpp.eu/help/policy.html . Please acknowledge the Data Providers.</Acknowledgement>
66 </AccessInformation> 66 </AccessInformation>
67 <ProviderName>SPDF</ProviderName> 67 <ProviderName>SPDF</ProviderName>
68 - <ProviderResourceName>psp/sweap/spi/l3/spi_sf0a_mom_inst/</ProviderResourceName> 68 + <ProviderResourceName>psp/sweap/spi/l3/spi_sf0a_l3_mom/</ProviderResourceName>
69 <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/PSP/SPI</InstrumentID> 69 <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/PSP/SPI</InstrumentID>
70 <MeasurementType>ThermalPlasma</MeasurementType> 70 <MeasurementType>ThermalPlasma</MeasurementType>
71 <TemporalDescription> 71 <TemporalDescription>
@@ -156,108 +156,6 @@ @@ -156,108 +156,6 @@
156 <ParticleQuantity>Temperature</ParticleQuantity> 156 <ParticleQuantity>Temperature</ParticleQuantity>
157 </Particle> 157 </Particle>
158 </Parameter> 158 </Parameter>
159 - <!-- <Parameter>  
160 - <Name>he++ t_rtn</Name>  
161 - <ParameterKey>psp_spi_awt</ParameterKey>  
162 - <Description>Temperature Tensor in RTN frame</Description>  
163 - <Units>eV</Units>  
164 - <CoordinateSystem>  
165 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
166 - <CoordinateSystemName>RTN</CoordinateSystemName>  
167 - </CoordinateSystem>  
168 - <RenderingHints>  
169 - <DisplayType>TimeSeries</DisplayType>  
170 - </RenderingHints>  
171 - <Structure>  
172 - <Size>6</Size>  
173 - <Element>  
174 - <Name>Txx</Name>  
175 - <Index>1</Index>  
176 - <ParameterKey>psp_spi_awt(0)</ParameterKey>  
177 - </Element>  
178 - <Element>  
179 - <Name>Tyy</Name>  
180 - <Index>2</Index>  
181 - <ParameterKey>psp_spi_awt(1)</ParameterKey>  
182 - </Element>  
183 - <Element>  
184 - <Name>Tzz</Name>  
185 - <Index>3</Index>  
186 - <ParameterKey>psp_spi_awt(2)</ParameterKey>  
187 - </Element>  
188 - <Element>  
189 - <Name>Txy</Name>  
190 - <Index>4</Index>  
191 - <ParameterKey>psp_spi_awt(3)</ParameterKey>  
192 - </Element>  
193 - <Element>  
194 - <Name>Txz</Name>  
195 - <Index>5</Index>  
196 - <ParameterKey>psp_spi_awt(4)</ParameterKey>  
197 - </Element>  
198 - <Element>  
199 - <Name>Tyz</Name>  
200 - <Index>6</Index>  
201 - <ParameterKey>psp_spi_awt(5)</ParameterKey>  
202 - </Element>  
203 - </Structure>  
204 - <Particle>  
205 - <ParticleType>Ion</ParticleType>  
206 - <Qualifier>Tensor</Qualifier>  
207 - <ParticleQuantity>Temperature</ParticleQuantity>  
208 - </Particle>  
209 - </Parameter>  
210 - <Parameter>  
211 - <Name>he++ t_sc</Name>  
212 - <ParameterKey>psp_spi_awt_sc</ParameterKey>  
213 - <Description>Temperature Tensor in SC frame</Description>  
214 - <Units>eV</Units>  
215 - <CoordinateSystem>  
216 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
217 - <CoordinateSystemName>SC</CoordinateSystemName>  
218 - </CoordinateSystem>  
219 - <RenderingHints>  
220 - <DisplayType>TimeSeries</DisplayType>  
221 - </RenderingHints>  
222 - <Structure>  
223 - <Size>6</Size>  
224 - <Element>  
225 - <Name>Txx</Name>  
226 - <Index>1</Index>  
227 - <ParameterKey>psp_spi_awt_sc(0)</ParameterKey>  
228 - </Element>  
229 - <Element>  
230 - <Name>Tyy</Name>  
231 - <Index>2</Index>  
232 - <ParameterKey>psp_spi_awt_sc(1)</ParameterKey>  
233 - </Element>  
234 - <Element>  
235 - <Name>Tzz</Name>  
236 - <Index>3</Index>  
237 - <ParameterKey>psp_spi_awt_sc(2)</ParameterKey>  
238 - </Element>  
239 - <Element>  
240 - <Name>Txy</Name>  
241 - <Index>4</Index>  
242 - <ParameterKey>psp_spi_awt_sc(3)</ParameterKey>  
243 - </Element>  
244 - <Element>  
245 - <Name>Txz</Name>  
246 - <Index>5</Index>  
247 - <ParameterKey>psp_spi_awt_sc(4)</ParameterKey>  
248 - </Element>  
249 - <Element>  
250 - <Name>Tyz</Name>  
251 - <Index>6</Index>  
252 - <ParameterKey>psp_spi_awt_sc(5)</ParameterKey>  
253 - </Element>  
254 - </Structure>  
255 - <Particle>  
256 - <ParticleType>Ion</ParticleType>  
257 - <Qualifier>Tensor</Qualifier>  
258 - <ParticleQuantity>Temperature</ParticleQuantity>  
259 - </Particle>  
260 - </Parameter> -->  
261 <Parameter> 159 <Parameter>
262 <Name>he++ v_inst</Name> 160 <Name>he++ v_inst</Name>
263 <ParameterKey>psp_spi_av_inst</ParameterKey> 161 <ParameterKey>psp_spi_av_inst</ParameterKey>
@@ -293,83 +191,44 @@ @@ -293,83 +191,44 @@
293 <ParticleQuantity>Velocity</ParticleQuantity> 191 <ParticleQuantity>Velocity</ParticleQuantity>
294 </Particle> 192 </Particle>
295 </Parameter> 193 </Parameter>
296 - <!-- <Parameter>  
297 - <Name>he++ v_rtn</Name>  
298 - <ParameterKey>psp_spi_av</ParameterKey>  
299 - <Description>Particle Velocity in RTN frame</Description>  
300 - <Units>km/s</Units>  
301 - <CoordinateSystem>  
302 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
303 - <CoordinateSystemName>RTN</CoordinateSystemName>  
304 - </CoordinateSystem>  
305 - <RenderingHints>  
306 - <DisplayType>TimeSeries</DisplayType>  
307 - </RenderingHints>  
308 - <Structure>  
309 - <Size>3</Size>  
310 - <Element>  
311 - <Name>vr</Name>  
312 - <Qualifier>Component.I</Qualifier>  
313 - <Index>1</Index>  
314 - <ParameterKey>psp_spi_av(0)</ParameterKey>  
315 - </Element>  
316 - <Element>  
317 - <Name>vt</Name>  
318 - <Qualifier>Component.J</Qualifier>  
319 - <Index>2</Index>  
320 - <ParameterKey>psp_spi_av(1)</ParameterKey>  
321 - </Element>  
322 - <Element>  
323 - <Name>vn</Name>  
324 - <Qualifier>Component.K</Qualifier>  
325 - <Index>3</Index>  
326 - <ParameterKey>psp_spc_av(2)</ParameterKey>  
327 - </Element>  
328 - </Structure>  
329 - <Particle>  
330 - <ParticleType>Ion</ParticleType>  
331 - <Qualifier>Vector</Qualifier>  
332 - <ParticleQuantity>Velocity</ParticleQuantity>  
333 - </Particle>  
334 - </Parameter>  
335 - <Parameter>  
336 - <Name>he++ v_sc</Name>  
337 - <ParameterKey>psp_spi_av_sc</ParameterKey>  
338 - <Description>Particle Velocity in SC frame</Description>  
339 - <Units>km/s</Units>  
340 - <CoordinateSystem>  
341 - <CoordinateRepresentation>Cartesian</CoordinateRepresentation>  
342 - <CoordinateSystemName>SC</CoordinateSystemName>  
343 - </CoordinateSystem>  
344 - <RenderingHints>  
345 - <DisplayType>TimeSeries</DisplayType>  
346 - </RenderingHints>  
347 - <Structure>  
348 - <Size>3</Size>  
349 - <Element>  
350 - <Name>vx</Name>  
351 - <Qualifier>Component.I</Qualifier>  
352 - <Index>1</Index>  
353 - <ParameterKey>psp_spi_av_sc(0)</ParameterKey>  
354 - </Element>  
355 - <Element>  
356 - <Name>vy</Name>  
357 - <Qualifier>Component.J</Qualifier>  
358 - <Index>2</Index>  
359 - <ParameterKey>psp_spi_av_sc(1)</ParameterKey>  
360 - </Element>  
361 - <Element>  
362 - <Name>vz</Name>  
363 - <Qualifier>Component.K</Qualifier>  
364 - <Index>3</Index>  
365 - <ParameterKey>psp_spc_av_sc(2)</ParameterKey>  
366 - </Element>  
367 - </Structure> 194 + <Parameter>
  195 + <Name>he++ v_rtn</Name>
  196 + <ParameterKey>psp_spi_av</ParameterKey>
  197 + <Description>Particle Velocity in RTN frame</Description>
  198 + <Units>km/s</Units>
  199 + <CoordinateSystem>
  200 + <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
  201 + <CoordinateSystemName>RTN</CoordinateSystemName>
  202 + </CoordinateSystem>
  203 + <RenderingHints>
  204 + <DisplayType>TimeSeries</DisplayType>
  205 + </RenderingHints>
  206 + <Structure>
  207 + <Size>3</Size>
  208 + <Element>
  209 + <Name>vr</Name>
  210 + <Qualifier>Component.I</Qualifier>
  211 + <Index>1</Index>
  212 + <ParameterKey>psp_spi_av(0)</ParameterKey>
  213 + </Element>
  214 + <Element>
  215 + <Name>vt</Name>
  216 + <Qualifier>Component.J</Qualifier>
  217 + <Index>2</Index>
  218 + <ParameterKey>psp_spi_av(1)</ParameterKey>
  219 + </Element>
  220 + <Element>
  221 + <Name>vn</Name>
  222 + <Qualifier>Component.K</Qualifier>
  223 + <Index>3</Index>
  224 + <ParameterKey>psp_spi_av(2)</ParameterKey>
  225 + </Element>
  226 + </Structure>
368 <Particle> 227 <Particle>
369 - <ParticleType>Ion</ParticleType>  
370 - <Qualifier>Vector</Qualifier>  
371 - <ParticleQuantity>Velocity</ParticleQuantity>  
372 - </Particle>  
373 - </Parameter> --> 228 + <ParticleType>Ion</ParticleType>
  229 + <Qualifier>Vector</Qualifier>
  230 + <ParticleQuantity>Velocity</ParticleQuantity>
  231 + </Particle>
  232 + </Parameter>
374 </NumericalData> 233 </NumericalData>
375 </Spase> 234 </Spase>