CDPP / CNES

Commit c75c7074bd8ed4be0456a43208962fe113305210

Authored by Quentin Brzustowski
1 parent e14600fd
Exists in master and in 11 other branches amdadev, aschulz, autocommit, bepi_master, bepi_update, cleanup_registry, cleanup_registry_master, cleanup_registry_merged, juice_jdc, juno_jade, soar

modified order of species in epiHi

Showing 3 changed files with 238 additions and 237 deletions   Show diff stats
Inline Side-by-side
NumericalData/CDPP-AMDA/PSP/epiHi/psp-het-1hr.xml
  Diff comments   View file @c75c707
... ... @@ -183,11 +183,12 @@
183 183 <ParticleQuantity>EnergyFlux</ParticleQuantity>
184 184 </Particle>
185 185 </Parameter>
  186 +
186 187 <Parameter>
187   - <Name>e- rate side A</Name>
188   - <ParameterKey>psp_het_1h_Aer</ParameterKey>
  188 + <Name>h+ rate side A</Name>
  189 + <ParameterKey>psp_het_1h_AHr</ParameterKey>
189 190 <Description>
190   - Electrons rate side A
  191 + proton rate side A
191 192 </Description>
192 193 <Units>counts/s</Units>
193 194 <RenderingHints>
... ... @@ -198,10 +199,10 @@
198 199 </Particle>
199 200 </Parameter>
200 201 <Parameter>
201   - <Name>e- rate side B</Name>
202   - <ParameterKey>psp_het_1h_Ber</ParameterKey>
  202 + <Name>h+ rate side B</Name>
  203 + <ParameterKey>psp_het_1h_BHr</ParameterKey>
203 204 <Description>
204   - Electrons rate side B
  205 + proton rate side B
205 206 </Description>
206 207 <Units>counts/s</Units>
207 208 <RenderingHints>
... ... @@ -212,10 +213,10 @@
212 213 </Particle>
213 214 </Parameter>
214 215 <Parameter>
215   - <Name>h+ rate side A</Name>
216   - <ParameterKey>psp_het_1h_AHr</ParameterKey>
  216 + <Name>e- rate side A</Name>
  217 + <ParameterKey>psp_het_1h_Aer</ParameterKey>
217 218 <Description>
218   - proton rate side A
  219 + Electrons rate side A
219 220 </Description>
220 221 <Units>counts/s</Units>
221 222 <RenderingHints>
... ... @@ -226,10 +227,10 @@
226 227 </Particle>
227 228 </Parameter>
228 229 <Parameter>
229   - <Name>h+ rate side B</Name>
230   - <ParameterKey>psp_het_1h_BHr</ParameterKey>
  230 + <Name>e- rate side B</Name>
  231 + <ParameterKey>psp_het_1h_Ber</ParameterKey>
231 232 <Description>
232   - proton rate side B
  233 + Electrons rate side B
233 234 </Description>
234 235 <Units>counts/s</Units>
235 236 <RenderingHints>
... ... @@ -267,11 +268,12 @@
267 268 <ParticleQuantity>CountRate</ParticleQuantity>
268 269 </Particle>
269 270 </Parameter>
  271 +
270 272 <Parameter>
271   - <Name>si rate side A</Name>
272   - <ParameterKey>psp_het_1h_ASir</ParameterKey>
  273 + <Name>c rate side A</Name>
  274 + <ParameterKey>psp_het_1h_ACr</ParameterKey>
273 275 <Description>
274   - Silicon rate side A
  276 + Carbon rate side A
275 277 </Description>
276 278 <Units>counts/s</Units>
277 279 <RenderingHints>
... ... @@ -282,10 +284,10 @@
282 284 </Particle>
283 285 </Parameter>
284 286 <Parameter>
285   - <Name>si rate side B</Name>
286   - <ParameterKey>psp_het_1h_BSir</ParameterKey>
  287 + <Name>c rate side B</Name>
  288 + <ParameterKey>psp_het_1h_BCr</ParameterKey>
287 289 <Description>
288   - Silicon rate side B
  290 + Carbon rate side B
289 291 </Description>
290 292 <Units>counts/s</Units>
291 293 <RenderingHints>
... ... @@ -296,10 +298,10 @@
296 298 </Particle>
297 299 </Parameter>
298 300 <Parameter>
299   - <Name>c rate side A</Name>
300   - <ParameterKey>psp_het_1h_ACr</ParameterKey>
  301 + <Name>o rate side A</Name>
  302 + <ParameterKey>psp_het_1h_AOr</ParameterKey>
301 303 <Description>
302   - Carbon rate side A
  304 + Oxygen rate side A
303 305 </Description>
304 306 <Units>counts/s</Units>
305 307 <RenderingHints>
... ... @@ -310,10 +312,10 @@
310 312 </Particle>
311 313 </Parameter>
312 314 <Parameter>
313   - <Name>c rate side B</Name>
314   - <ParameterKey>psp_het_1h_BCr</ParameterKey>
  315 + <Name>o rate side B</Name>
  316 + <ParameterKey>psp_het_1h_BOr</ParameterKey>
315 317 <Description>
316   - Carbon rate side B
  318 + Oxygen rate side B
317 319 </Description>
318 320 <Units>counts/s</Units>
319 321 <RenderingHints>
... ... @@ -324,10 +326,10 @@
324 326 </Particle>
325 327 </Parameter>
326 328 <Parameter>
327   - <Name>n rate side A</Name>
328   - <ParameterKey>psp_het_1h_ANr</ParameterKey>
  329 + <Name>fe rate side A</Name>
  330 + <ParameterKey>psp_het_1h_AFer</ParameterKey>
329 331 <Description>
330   - Nitrogen rate side A
  332 + Iron rate side A
331 333 </Description>
332 334 <Units>counts/s</Units>
333 335 <RenderingHints>
... ... @@ -338,10 +340,10 @@
338 340 </Particle>
339 341 </Parameter>
340 342 <Parameter>
341   - <Name>n rate side B</Name>
342   - <ParameterKey>psp_het_1h_BNr</ParameterKey>
  343 + <Name>fe rate side B</Name>
  344 + <ParameterKey>psp_het_1h_BFer</ParameterKey>
343 345 <Description>
344   - Nitrogen rate side B
  346 + Iron rate side B
345 347 </Description>
346 348 <Units>counts/s</Units>
347 349 <RenderingHints>
... ... @@ -351,11 +353,13 @@
351 353 <ParticleQuantity>CountRate</ParticleQuantity>
352 354 </Particle>
353 355 </Parameter>
  356 +
  357 +
354 358 <Parameter>
355   - <Name>ne rate side A</Name>
356   - <ParameterKey>psp_het_1h_ANer</ParameterKey>
  359 + <Name>n rate side A</Name>
  360 + <ParameterKey>psp_het_1h_ANr</ParameterKey>
357 361 <Description>
358   - Neon rate side A
  362 + Nitrogen rate side A
359 363 </Description>
360 364 <Units>counts/s</Units>
361 365 <RenderingHints>
... ... @@ -366,10 +370,10 @@
366 370 </Particle>
367 371 </Parameter>
368 372 <Parameter>
369   - <Name>ne rate side B</Name>
370   - <ParameterKey>psp_het_1h_BNer</ParameterKey>
  373 + <Name>n rate side B</Name>
  374 + <ParameterKey>psp_het_1h_BNr</ParameterKey>
371 375 <Description>
372   - Neon rate side B
  376 + Nitrogen rate side B
373 377 </Description>
374 378 <Units>counts/s</Units>
375 379 <RenderingHints>
... ... @@ -380,10 +384,10 @@
380 384 </Particle>
381 385 </Parameter>
382 386 <Parameter>
383   - <Name>s rate side A</Name>
384   - <ParameterKey>psp_het_1h_ASr</ParameterKey>
  387 + <Name>ne rate side A</Name>
  388 + <ParameterKey>psp_het_1h_ANer</ParameterKey>
385 389 <Description>
386   - Sulfur rate side A
  390 + Neon rate side A
387 391 </Description>
388 392 <Units>counts/s</Units>
389 393 <RenderingHints>
... ... @@ -394,10 +398,10 @@
394 398 </Particle>
395 399 </Parameter>
396 400 <Parameter>
397   - <Name>s rate side B</Name>
398   - <ParameterKey>psp_het_1h_BSr</ParameterKey>
  401 + <Name>ne rate side B</Name>
  402 + <ParameterKey>psp_het_1h_BNer</ParameterKey>
399 403 <Description>
400   - Sulfur rate side B
  404 + Neon rate side B
401 405 </Description>
402 406 <Units>counts/s</Units>
403 407 <RenderingHints>
... ... @@ -408,10 +412,10 @@
408 412 </Particle>
409 413 </Parameter>
410 414 <Parameter>
411   - <Name>fe rate side A</Name>
412   - <ParameterKey>psp_het_1h_AFer</ParameterKey>
  415 + <Name>na rate side A</Name>
  416 + <ParameterKey>psp_het_1h_ANar</ParameterKey>
413 417 <Description>
414   - Iron rate side A
  418 + Sodium rate side A
415 419 </Description>
416 420 <Units>counts/s</Units>
417 421 <RenderingHints>
... ... @@ -422,10 +426,10 @@
422 426 </Particle>
423 427 </Parameter>
424 428 <Parameter>
425   - <Name>fe rate side B</Name>
426   - <ParameterKey>psp_het_1h_BFer</ParameterKey>
  429 + <Name>na rate side B</Name>
  430 + <ParameterKey>psp_het_1h_BNar</ParameterKey>
427 431 <Description>
428   - Iron rate side B
  432 + Sodium rate side B
429 433 </Description>
430 434 <Units>counts/s</Units>
431 435 <RenderingHints>
... ... @@ -435,11 +439,14 @@
435 439 <ParticleQuantity>CountRate</ParticleQuantity>
436 440 </Particle>
437 441 </Parameter>
  442 +
  443 +
  444 +
438 445 <Parameter>
439   - <Name>cr rate side A</Name>
440   - <ParameterKey>psp_het_1h_ACrr</ParameterKey>
  446 + <Name>mg rate side A</Name>
  447 + <ParameterKey>psp_het_1h_AMgr</ParameterKey>
441 448 <Description>
442   - Chromium rate side A
  449 + Magnesium rate side A
443 450 </Description>
444 451 <Units>counts/s</Units>
445 452 <RenderingHints>
... ... @@ -450,10 +457,10 @@
450 457 </Particle>
451 458 </Parameter>
452 459 <Parameter>
453   - <Name>cr rate side B</Name>
454   - <ParameterKey>psp_het_1h_BCrr</ParameterKey>
  460 + <Name>mg rate side B</Name>
  461 + <ParameterKey>psp_het_1h_BMgr</ParameterKey>
455 462 <Description>
456   - Chromium rate side B
  463 + Magnesium rate side B
457 464 </Description>
458 465 <Units>counts/s</Units>
459 466 <RenderingHints>
... ... @@ -463,11 +470,12 @@
463 470 <ParticleQuantity>CountRate</ParticleQuantity>
464 471 </Particle>
465 472 </Parameter>
  473 +
466 474 <Parameter>
467   - <Name>o rate side A</Name>
468   - <ParameterKey>psp_het_1h_AOr</ParameterKey>
  475 + <Name>al rate side A</Name>
  476 + <ParameterKey>psp_het_1h_AAlr</ParameterKey>
469 477 <Description>
470   - Oxygen rate side A
  478 + Aluminium rate side A
471 479 </Description>
472 480 <Units>counts/s</Units>
473 481 <RenderingHints>
... ... @@ -478,10 +486,10 @@
478 486 </Particle>
479 487 </Parameter>
480 488 <Parameter>
481   - <Name>o rate side B</Name>
482   - <ParameterKey>psp_het_1h_BOr</ParameterKey>
  489 + <Name>al rate side B</Name>
  490 + <ParameterKey>psp_het_1h_BAlr</ParameterKey>
483 491 <Description>
484   - Oxygen rate side B
  492 + Aluminium rate side B
485 493 </Description>
486 494 <Units>counts/s</Units>
487 495 <RenderingHints>
... ... @@ -492,10 +500,10 @@
492 500 </Particle>
493 501 </Parameter>
494 502 <Parameter>
495   - <Name>ni rate side A</Name>
496   - <ParameterKey>psp_het_1h_ANir</ParameterKey>
  503 + <Name>si rate side A</Name>
  504 + <ParameterKey>psp_het_1h_ASir</ParameterKey>
497 505 <Description>
498   - Nickel rate side A
  506 + Silicon rate side A
499 507 </Description>
500 508 <Units>counts/s</Units>
501 509 <RenderingHints>
... ... @@ -506,10 +514,10 @@
506 514 </Particle>
507 515 </Parameter>
508 516 <Parameter>
509   - <Name>ni rate side B</Name>
510   - <ParameterKey>psp_het_1h_BNir</ParameterKey>
  517 + <Name>si rate side B</Name>
  518 + <ParameterKey>psp_het_1h_BSir</ParameterKey>
511 519 <Description>
512   - Nickel rate side B
  520 + Silicon rate side B
513 521 </Description>
514 522 <Units>counts/s</Units>
515 523 <RenderingHints>
... ... @@ -520,10 +528,10 @@
520 528 </Particle>
521 529 </Parameter>
522 530 <Parameter>
523   - <Name>ca rate side A</Name>
524   - <ParameterKey>psp_het_1h_ACar</ParameterKey>
  531 + <Name>s rate side A</Name>
  532 + <ParameterKey>psp_het_1h_ASr</ParameterKey>
525 533 <Description>
526   - Calcium rate side A
  534 + Sulfur rate side A
527 535 </Description>
528 536 <Units>counts/s</Units>
529 537 <RenderingHints>
... ... @@ -534,10 +542,10 @@
534 542 </Particle>
535 543 </Parameter>
536 544 <Parameter>
537   - <Name>ca rate side B</Name>
538   - <ParameterKey>psp_het_1h_BCar</ParameterKey>
  545 + <Name>s rate side B</Name>
  546 + <ParameterKey>psp_het_1h_BSr</ParameterKey>
539 547 <Description>
540   - Calcium rate side B
  548 + Sulfur rate side B
541 549 </Description>
542 550 <Units>counts/s</Units>
543 551 <RenderingHints>
... ... @@ -547,11 +555,12 @@
547 555 <ParticleQuantity>CountRate</ParticleQuantity>
548 556 </Particle>
549 557 </Parameter>
  558 +
550 559 <Parameter>
551   - <Name>al rate side A</Name>
552   - <ParameterKey>psp_het_1h_AAlr</ParameterKey>
  560 + <Name>ar rate side A</Name>
  561 + <ParameterKey>psp_het_1h_AArr</ParameterKey>
553 562 <Description>
554   - Aluminium rate side A
  563 + Argon rate side A
555 564 </Description>
556 565 <Units>counts/s</Units>
557 566 <RenderingHints>
... ... @@ -562,10 +571,10 @@
562 571 </Particle>
563 572 </Parameter>
564 573 <Parameter>
565   - <Name>al rate side B</Name>
566   - <ParameterKey>psp_het_1h_BAlr</ParameterKey>
  574 + <Name>ar rate side B</Name>
  575 + <ParameterKey>psp_het_1h_BArr</ParameterKey>
567 576 <Description>
568   - Aluminium rate side B
  577 + Argon rate side B
569 578 </Description>
570 579 <Units>counts/s</Units>
571 580 <RenderingHints>
... ... @@ -576,10 +585,10 @@
576 585 </Particle>
577 586 </Parameter>
578 587 <Parameter>
579   - <Name>mg rate side A</Name>
580   - <ParameterKey>psp_het_1h_AMgr</ParameterKey>
  588 + <Name>ca rate side A</Name>
  589 + <ParameterKey>psp_het_1h_ACar</ParameterKey>
581 590 <Description>
582   - Magnesium rate side A
  591 + Calcium rate side A
583 592 </Description>
584 593 <Units>counts/s</Units>
585 594 <RenderingHints>
... ... @@ -590,10 +599,10 @@
590 599 </Particle>
591 600 </Parameter>
592 601 <Parameter>
593   - <Name>mg rate side B</Name>
594   - <ParameterKey>psp_het_1h_BMgr</ParameterKey>
  602 + <Name>ca rate side B</Name>
  603 + <ParameterKey>psp_het_1h_BCar</ParameterKey>
595 604 <Description>
596   - Magnesium rate side B
  605 + Calcium rate side B
597 606 </Description>
598 607 <Units>counts/s</Units>
599 608 <RenderingHints>
... ... @@ -603,12 +612,11 @@
603 612 <ParticleQuantity>CountRate</ParticleQuantity>
604 613 </Particle>
605 614 </Parameter>
606   -
607 615 <Parameter>
608   - <Name>ar rate side A</Name>
609   - <ParameterKey>psp_het_1h_AArr</ParameterKey>
  616 + <Name>cr rate side A</Name>
  617 + <ParameterKey>psp_het_1h_ACrr</ParameterKey>
610 618 <Description>
611   - Argon rate side A
  619 + Chromium rate side A
612 620 </Description>
613 621 <Units>counts/s</Units>
614 622 <RenderingHints>
... ... @@ -619,10 +627,10 @@
619 627 </Particle>
620 628 </Parameter>
621 629 <Parameter>
622   - <Name>ar rate side B</Name>
623   - <ParameterKey>psp_het_1h_BArr</ParameterKey>
  630 + <Name>cr rate side B</Name>
  631 + <ParameterKey>psp_het_1h_BCrr</ParameterKey>
624 632 <Description>
625   - Argon rate side B
  633 + Chromium rate side B
626 634 </Description>
627 635 <Units>counts/s</Units>
628 636 <RenderingHints>
... ... @@ -632,11 +640,12 @@
632 640 <ParticleQuantity>CountRate</ParticleQuantity>
633 641 </Particle>
634 642 </Parameter>
  643 +
635 644 <Parameter>
636   - <Name>na rate side A</Name>
637   - <ParameterKey>psp_het_1h_ANar</ParameterKey>
  645 + <Name>ni rate side A</Name>
  646 + <ParameterKey>psp_het_1h_ANir</ParameterKey>
638 647 <Description>
639   - Sodium rate side A
  648 + Nickel rate side A
640 649 </Description>
641 650 <Units>counts/s</Units>
642 651 <RenderingHints>
... ... @@ -647,10 +656,10 @@
647 656 </Particle>
648 657 </Parameter>
649 658 <Parameter>
650   - <Name>na rate side B</Name>
651   - <ParameterKey>psp_het_1h_BNar</ParameterKey>
  659 + <Name>ni rate side B</Name>
  660 + <ParameterKey>psp_het_1h_BNir</ParameterKey>
652 661 <Description>
653   - Sodium rate side B
  662 + Nickel rate side B
654 663 </Description>
655 664 <Units>counts/s</Units>
656 665 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/PSP/epiHi/psp-let1-1hr.xml
  Diff comments   View file @c75c707
... ... @@ -237,10 +237,10 @@
237 237 </Particle>
238 238 </Parameter>
239 239 <Parameter>
240   - <Name>si rate side A</Name>
241   - <ParameterKey>psp_let1_1h_ASir</ParameterKey>
  240 + <Name>c rate side A</Name>
  241 + <ParameterKey>psp_let1_1h_ACr</ParameterKey>
242 242 <Description>
243   - Silicon rate side A
  243 + Carbon rate side A
244 244 </Description>
245 245 <Units>counts/s</Units>
246 246 <RenderingHints>
... ... @@ -251,10 +251,10 @@
251 251 </Particle>
252 252 </Parameter>
253 253 <Parameter>
254   - <Name>si rate side B</Name>
255   - <ParameterKey>psp_let1_1h_BSir</ParameterKey>
  254 + <Name>c rate side B</Name>
  255 + <ParameterKey>psp_let1_1h_BCr</ParameterKey>
256 256 <Description>
257   - Silicon rate side B
  257 + Carbon rate side B
258 258 </Description>
259 259 <Units>counts/s</Units>
260 260 <RenderingHints>
... ... @@ -265,10 +265,10 @@
265 265 </Particle>
266 266 </Parameter>
267 267 <Parameter>
268   - <Name>c rate side A</Name>
269   - <ParameterKey>psp_let1_1h_ACr</ParameterKey>
  268 + <Name>o rate side A</Name>
  269 + <ParameterKey>psp_let1_1h_AOr</ParameterKey>
270 270 <Description>
271   - Carbon rate side A
  271 + Oxygen rate side A
272 272 </Description>
273 273 <Units>counts/s</Units>
274 274 <RenderingHints>
... ... @@ -279,10 +279,10 @@
279 279 </Particle>
280 280 </Parameter>
281 281 <Parameter>
282   - <Name>c rate side B</Name>
283   - <ParameterKey>psp_let1_1h_BCr</ParameterKey>
  282 + <Name>o rate side B</Name>
  283 + <ParameterKey>psp_let1_1h_BOr</ParameterKey>
284 284 <Description>
285   - Carbon rate side B
  285 + Oxygen rate side B
286 286 </Description>
287 287 <Units>counts/s</Units>
288 288 <RenderingHints>
... ... @@ -293,10 +293,10 @@
293 293 </Particle>
294 294 </Parameter>
295 295 <Parameter>
296   - <Name>n rate side A</Name>
297   - <ParameterKey>psp_let1_1h_ANr</ParameterKey>
  296 + <Name>fe rate side A</Name>
  297 + <ParameterKey>psp_let1_1h_AFer</ParameterKey>
298 298 <Description>
299   - Nitrogen rate side A
  299 + Iron rate side A
300 300 </Description>
301 301 <Units>counts/s</Units>
302 302 <RenderingHints>
... ... @@ -307,10 +307,10 @@
307 307 </Particle>
308 308 </Parameter>
309 309 <Parameter>
310   - <Name>n rate side B</Name>
311   - <ParameterKey>psp_let1_1h_BNr</ParameterKey>
  310 + <Name>fe rate side B</Name>
  311 + <ParameterKey>psp_let1_1h_BFer</ParameterKey>
312 312 <Description>
313   - Nitrogen rate side B
  313 + Iron rate side B
314 314 </Description>
315 315 <Units>counts/s</Units>
316 316 <RenderingHints>
... ... @@ -320,11 +320,12 @@
320 320 <ParticleQuantity>CountRate</ParticleQuantity>
321 321 </Particle>
322 322 </Parameter>
  323 +
323 324 <Parameter>
324   - <Name>ne rate side A</Name>
325   - <ParameterKey>psp_let1_1h_ANer</ParameterKey>
  325 + <Name>n rate side A</Name>
  326 + <ParameterKey>psp_let1_1h_ANr</ParameterKey>
326 327 <Description>
327   - Neon rate side A
  328 + Nitrogen rate side A
328 329 </Description>
329 330 <Units>counts/s</Units>
330 331 <RenderingHints>
... ... @@ -335,10 +336,10 @@
335 336 </Particle>
336 337 </Parameter>
337 338 <Parameter>
338   - <Name>ne rate side B</Name>
339   - <ParameterKey>psp_let1_1h_BNer</ParameterKey>
  339 + <Name>n rate side B</Name>
  340 + <ParameterKey>psp_let1_1h_BNr</ParameterKey>
340 341 <Description>
341   - Neon rate side B
  342 + Nitrogen rate side B
342 343 </Description>
343 344 <Units>counts/s</Units>
344 345 <RenderingHints>
... ... @@ -349,10 +350,10 @@
349 350 </Particle>
350 351 </Parameter>
351 352 <Parameter>
352   - <Name>s rate side A</Name>
353   - <ParameterKey>psp_let1_1h_ASr</ParameterKey>
  353 + <Name>ne rate side A</Name>
  354 + <ParameterKey>psp_let1_1h_ANer</ParameterKey>
354 355 <Description>
355   - Sulfur rate side A
  356 + Neon rate side A
356 357 </Description>
357 358 <Units>counts/s</Units>
358 359 <RenderingHints>
... ... @@ -363,10 +364,10 @@
363 364 </Particle>
364 365 </Parameter>
365 366 <Parameter>
366   - <Name>s rate side B</Name>
367   - <ParameterKey>psp_let1_1h_BSr</ParameterKey>
  367 + <Name>ne rate side B</Name>
  368 + <ParameterKey>psp_let1_1h_BNer</ParameterKey>
368 369 <Description>
369   - Sulfur rate side B
  370 + Neon rate side B
370 371 </Description>
371 372 <Units>counts/s</Units>
372 373 <RenderingHints>
... ... @@ -377,10 +378,10 @@
377 378 </Particle>
378 379 </Parameter>
379 380 <Parameter>
380   - <Name>fe rate side A</Name>
381   - <ParameterKey>psp_let1_1h_AFer</ParameterKey>
  381 + <Name>na rate side A</Name>
  382 + <ParameterKey>psp_let1_1h_ANar</ParameterKey>
382 383 <Description>
383   - Iron rate side A
  384 + Sodium rate side A
384 385 </Description>
385 386 <Units>counts/s</Units>
386 387 <RenderingHints>
... ... @@ -391,10 +392,10 @@
391 392 </Particle>
392 393 </Parameter>
393 394 <Parameter>
394   - <Name>fe rate side B</Name>
395   - <ParameterKey>psp_let1_1h_BFer</ParameterKey>
  395 + <Name>na rate side B</Name>
  396 + <ParameterKey>psp_let1_1h_BNar</ParameterKey>
396 397 <Description>
397   - Iron rate side B
  398 + Sodium rate side B
398 399 </Description>
399 400 <Units>counts/s</Units>
400 401 <RenderingHints>
... ... @@ -404,11 +405,13 @@
404 405 <ParticleQuantity>CountRate</ParticleQuantity>
405 406 </Particle>
406 407 </Parameter>
  408 +
  409 +
407 410 <Parameter>
408   - <Name>cr rate side A</Name>
409   - <ParameterKey>psp_let1_1h_ACrr</ParameterKey>
  411 + <Name>mg rate side A</Name>
  412 + <ParameterKey>psp_let1_1h_AMgr</ParameterKey>
410 413 <Description>
411   - Chromium rate side A
  414 + Magnesium rate side A
412 415 </Description>
413 416 <Units>counts/s</Units>
414 417 <RenderingHints>
... ... @@ -419,10 +422,10 @@
419 422 </Particle>
420 423 </Parameter>
421 424 <Parameter>
422   - <Name>cr rate side B</Name>
423   - <ParameterKey>psp_let1_1h_BCrr</ParameterKey>
  425 + <Name>mg rate side B</Name>
  426 + <ParameterKey>psp_let1_1h_BMgr</ParameterKey>
424 427 <Description>
425   - Chromium rate side B
  428 + Magnesium rate side B
426 429 </Description>
427 430 <Units>counts/s</Units>
428 431 <RenderingHints>
... ... @@ -433,10 +436,10 @@
433 436 </Particle>
434 437 </Parameter>
435 438 <Parameter>
436   - <Name>o rate side A</Name>
437   - <ParameterKey>psp_let1_1h_AOr</ParameterKey>
  439 + <Name>al rate side A</Name>
  440 + <ParameterKey>psp_let1_1h_AAlr</ParameterKey>
438 441 <Description>
439   - Oxygen rate side A
  442 + Aluminium rate side A
440 443 </Description>
441 444 <Units>counts/s</Units>
442 445 <RenderingHints>
... ... @@ -447,10 +450,10 @@
447 450 </Particle>
448 451 </Parameter>
449 452 <Parameter>
450   - <Name>o rate side B</Name>
451   - <ParameterKey>psp_let1_1h_BOr</ParameterKey>
  453 + <Name>al rate side B</Name>
  454 + <ParameterKey>psp_let1_1h_BAlr</ParameterKey>
452 455 <Description>
453   - Oxygen rate side B
  456 + Aluminium rate side B
454 457 </Description>
455 458 <Units>counts/s</Units>
456 459 <RenderingHints>
... ... @@ -461,10 +464,10 @@
461 464 </Particle>
462 465 </Parameter>
463 466 <Parameter>
464   - <Name>ni rate side A</Name>
465   - <ParameterKey>psp_let1_1h_ANir</ParameterKey>
  467 + <Name>si rate side A</Name>
  468 + <ParameterKey>psp_let1_1h_ASir</ParameterKey>
466 469 <Description>
467   - Nickel rate side A
  470 + Silicon rate side A
468 471 </Description>
469 472 <Units>counts/s</Units>
470 473 <RenderingHints>
... ... @@ -475,10 +478,10 @@
475 478 </Particle>
476 479 </Parameter>
477 480 <Parameter>
478   - <Name>ni rate side B</Name>
479   - <ParameterKey>psp_let1_1h_BNir</ParameterKey>
  481 + <Name>si rate side B</Name>
  482 + <ParameterKey>psp_let1_1h_BSir</ParameterKey>
480 483 <Description>
481   - Nickel rate side B
  484 + Silicon rate side B
482 485 </Description>
483 486 <Units>counts/s</Units>
484 487 <RenderingHints>
... ... @@ -489,10 +492,10 @@
489 492 </Particle>
490 493 </Parameter>
491 494 <Parameter>
492   - <Name>ca rate side A</Name>
493   - <ParameterKey>psp_let1_1h_ACar</ParameterKey>
  495 + <Name>s rate side A</Name>
  496 + <ParameterKey>psp_let1_1h_ASr</ParameterKey>
494 497 <Description>
495   - Calcium rate side A
  498 + Sulfur rate side A
496 499 </Description>
497 500 <Units>counts/s</Units>
498 501 <RenderingHints>
... ... @@ -503,10 +506,10 @@
503 506 </Particle>
504 507 </Parameter>
505 508 <Parameter>
506   - <Name>ca rate side B</Name>
507   - <ParameterKey>psp_let1_1h_BCar</ParameterKey>
  509 + <Name>s rate side B</Name>
  510 + <ParameterKey>psp_let1_1h_BSr</ParameterKey>
508 511 <Description>
509   - Calcium rate side B
  512 + Sulfur rate side B
510 513 </Description>
511 514 <Units>counts/s</Units>
512 515 <RenderingHints>
... ... @@ -517,10 +520,10 @@
517 520 </Particle>
518 521 </Parameter>
519 522 <Parameter>
520   - <Name>al rate side A</Name>
521   - <ParameterKey>psp_let1_1h_AAlr</ParameterKey>
  523 + <Name>ar rate side A</Name>
  524 + <ParameterKey>psp_let1_1h_AArr</ParameterKey>
522 525 <Description>
523   - Aluminium rate side A
  526 + Argon rate side A
524 527 </Description>
525 528 <Units>counts/s</Units>
526 529 <RenderingHints>
... ... @@ -531,10 +534,10 @@
531 534 </Particle>
532 535 </Parameter>
533 536 <Parameter>
534   - <Name>al rate side B</Name>
535   - <ParameterKey>psp_let1_1h_BAlr</ParameterKey>
  537 + <Name>ar rate side B</Name>
  538 + <ParameterKey>psp_let1_1h_BArr</ParameterKey>
536 539 <Description>
537   - Aluminium rate side B
  540 + Argon rate side B
538 541 </Description>
539 542 <Units>counts/s</Units>
540 543 <RenderingHints>
... ... @@ -545,10 +548,10 @@
545 548 </Particle>
546 549 </Parameter>
547 550 <Parameter>
548   - <Name>mg rate side A</Name>
549   - <ParameterKey>psp_let1_1h_AMgr</ParameterKey>
  551 + <Name>ca rate side A</Name>
  552 + <ParameterKey>psp_let1_1h_ACar</ParameterKey>
550 553 <Description>
551   - Magnesium rate side A
  554 + Calcium rate side A
552 555 </Description>
553 556 <Units>counts/s</Units>
554 557 <RenderingHints>
... ... @@ -559,10 +562,10 @@
559 562 </Particle>
560 563 </Parameter>
561 564 <Parameter>
562   - <Name>mg rate side B</Name>
563   - <ParameterKey>psp_let1_1h_BMgr</ParameterKey>
  565 + <Name>ca rate side B</Name>
  566 + <ParameterKey>psp_let1_1h_BCar</ParameterKey>
564 567 <Description>
565   - Magnesium rate side B
  568 + Calcium rate side B
566 569 </Description>
567 570 <Units>counts/s</Units>
568 571 <RenderingHints>
... ... @@ -573,10 +576,10 @@
573 576 </Particle>
574 577 </Parameter>
575 578 <Parameter>
576   - <Name>ar rate side A</Name>
577   - <ParameterKey>psp_let1_1h_AArr</ParameterKey>
  579 + <Name>cr rate side A</Name>
  580 + <ParameterKey>psp_let1_1h_ACrr</ParameterKey>
578 581 <Description>
579   - Argon rate side A
  582 + Chromium rate side A
580 583 </Description>
581 584 <Units>counts/s</Units>
582 585 <RenderingHints>
... ... @@ -587,10 +590,10 @@
587 590 </Particle>
588 591 </Parameter>
589 592 <Parameter>
590   - <Name>ar rate side B</Name>
591   - <ParameterKey>psp_let1_1h_BArr</ParameterKey>
  593 + <Name>cr rate side B</Name>
  594 + <ParameterKey>psp_let1_1h_BCrr</ParameterKey>
592 595 <Description>
593   - Argon rate side B
  596 + Chromium rate side B
594 597 </Description>
595 598 <Units>counts/s</Units>
596 599 <RenderingHints>
... ... @@ -600,11 +603,12 @@
600 603 <ParticleQuantity>CountRate</ParticleQuantity>
601 604 </Particle>
602 605 </Parameter>
  606 +
603 607 <Parameter>
604   - <Name>na rate side A</Name>
605   - <ParameterKey>psp_let1_1h_ANar</ParameterKey>
  608 + <Name>ni rate side A</Name>
  609 + <ParameterKey>psp_let1_1h_ANir</ParameterKey>
606 610 <Description>
607   - Sodium rate side A
  611 + Nickel rate side A
608 612 </Description>
609 613 <Units>counts/s</Units>
610 614 <RenderingHints>
... ... @@ -615,10 +619,10 @@
615 619 </Particle>
616 620 </Parameter>
617 621 <Parameter>
618   - <Name>na rate side B</Name>
619   - <ParameterKey>psp_let1_1h_BNar</ParameterKey>
  622 + <Name>ni rate side B</Name>
  623 + <ParameterKey>psp_let1_1h_BNir</ParameterKey>
620 624 <Description>
621   - Sodium rate side B
  625 + Nickel rate side B
622 626 </Description>
623 627 <Units>counts/s</Units>
624 628 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/PSP/epiHi/psp-let2-1hr.xml
  Diff comments   View file @c75c707
... ... @@ -153,10 +153,10 @@
153 153 </Particle>
154 154 </Parameter>
155 155 <Parameter>
156   - <Name>si rate side C</Name>
157   - <ParameterKey>psp_let2_1h_Sir</ParameterKey>
  156 + <Name>c rate side C</Name>
  157 + <ParameterKey>psp_let2_1h_Cr</ParameterKey>
158 158 <Description>
159   - Silicon rate side C
  159 + Carbon rate side C
160 160 </Description>
161 161 <Units>counts/s</Units>
162 162 <RenderingHints>
... ... @@ -166,12 +166,11 @@
166 166 <ParticleQuantity>CountRate</ParticleQuantity>
167 167 </Particle>
168 168 </Parameter>
169   -
170 169 <Parameter>
171   - <Name>c rate side C</Name>
172   - <ParameterKey>psp_let2_1h_Cr</ParameterKey>
  170 + <Name>o rate side C</Name>
  171 + <ParameterKey>psp_let2_1h_Or</ParameterKey>
173 172 <Description>
174   - Carbon rate side C
  173 + Oxygen rate side C
175 174 </Description>
176 175 <Units>counts/s</Units>
177 176 <RenderingHints>
... ... @@ -181,12 +180,11 @@
181 180 <ParticleQuantity>CountRate</ParticleQuantity>
182 181 </Particle>
183 182 </Parameter>
184   -
185 183 <Parameter>
186   - <Name>n rate side C</Name>
187   - <ParameterKey>psp_let2_1h_Nr</ParameterKey>
  184 + <Name>fe rate side C</Name>
  185 + <ParameterKey>psp_let2_1h_Fer</ParameterKey>
188 186 <Description>
189   - Nitrogen rate side C
  187 + Iron rate side C
190 188 </Description>
191 189 <Units>counts/s</Units>
192 190 <RenderingHints>
... ... @@ -196,12 +194,11 @@
196 194 <ParticleQuantity>CountRate</ParticleQuantity>
197 195 </Particle>
198 196 </Parameter>
199   -
200 197 <Parameter>
201   - <Name>ne rate side C</Name>
202   - <ParameterKey>psp_let2_1h_Ner</ParameterKey>
  198 + <Name>n rate side C</Name>
  199 + <ParameterKey>psp_let2_1h_Nr</ParameterKey>
203 200 <Description>
204   - Neon rate side C
  201 + Nitrogen rate side C
205 202 </Description>
206 203 <Units>counts/s</Units>
207 204 <RenderingHints>
... ... @@ -211,12 +208,12 @@
211 208 <ParticleQuantity>CountRate</ParticleQuantity>
212 209 </Particle>
213 210 </Parameter>
214   -
  211 +
215 212 <Parameter>
216   - <Name>s rate side C</Name>
217   - <ParameterKey>psp_let2_1h_Sr</ParameterKey>
  213 + <Name>ne rate side C</Name>
  214 + <ParameterKey>psp_let2_1h_Ner</ParameterKey>
218 215 <Description>
219   - Sulfur rate side C
  216 + Neon rate side C
220 217 </Description>
221 218 <Units>counts/s</Units>
222 219 <RenderingHints>
... ... @@ -226,12 +223,11 @@
226 223 <ParticleQuantity>CountRate</ParticleQuantity>
227 224 </Particle>
228 225 </Parameter>
229   -
230 226 <Parameter>
231   - <Name>fe rate side C</Name>
232   - <ParameterKey>psp_let2_1h_Fer</ParameterKey>
  227 + <Name>na rate side C</Name>
  228 + <ParameterKey>psp_let2_1h_Nar</ParameterKey>
233 229 <Description>
234   - Iron rate side C
  230 + Sodium rate side C
235 231 </Description>
236 232 <Units>counts/s</Units>
237 233 <RenderingHints>
... ... @@ -241,12 +237,11 @@
241 237 <ParticleQuantity>CountRate</ParticleQuantity>
242 238 </Particle>
243 239 </Parameter>
244   -
245   - <Parameter>
246   - <Name>cr rate side C</Name>
247   - <ParameterKey>psp_let2_1h_Crr</ParameterKey>
  240 + <Parameter>
  241 + <Name>mg rate side C</Name>
  242 + <ParameterKey>psp_let2_1h_Mgr</ParameterKey>
248 243 <Description>
249   - Chromium rate side C
  244 + Magnesium rate side C
250 245 </Description>
251 246 <Units>counts/s</Units>
252 247 <RenderingHints>
... ... @@ -256,12 +251,11 @@
256 251 <ParticleQuantity>CountRate</ParticleQuantity>
257 252 </Particle>
258 253 </Parameter>
259   -
260 254 <Parameter>
261   - <Name>o rate side C</Name>
262   - <ParameterKey>psp_let2_1h_Or</ParameterKey>
  255 + <Name>al rate side C</Name>
  256 + <ParameterKey>psp_let2_1h_Alr</ParameterKey>
263 257 <Description>
264   - Oxygen rate side C
  258 + Aluminium rate side C
265 259 </Description>
266 260 <Units>counts/s</Units>
267 261 <RenderingHints>
... ... @@ -271,12 +265,11 @@
271 265 <ParticleQuantity>CountRate</ParticleQuantity>
272 266 </Particle>
273 267 </Parameter>
274   -
275 268 <Parameter>
276   - <Name>ni rate side C</Name>
277   - <ParameterKey>psp_let2_1h_Nir</ParameterKey>
  269 + <Name>si rate side C</Name>
  270 + <ParameterKey>psp_let2_1h_Sir</ParameterKey>
278 271 <Description>
279   - Nickel rate side C
  272 + Silicon rate side C
280 273 </Description>
281 274 <Units>counts/s</Units>
282 275 <RenderingHints>
... ... @@ -286,12 +279,11 @@
286 279 <ParticleQuantity>CountRate</ParticleQuantity>
287 280 </Particle>
288 281 </Parameter>
289   -
290 282 <Parameter>
291   - <Name>ca rate side C</Name>
292   - <ParameterKey>psp_let2_1h_Car</ParameterKey>
  283 + <Name>s rate side C</Name>
  284 + <ParameterKey>psp_let2_1h_Sr</ParameterKey>
293 285 <Description>
294   - Calcium rate side C
  286 + Sulfur rate side C
295 287 </Description>
296 288 <Units>counts/s</Units>
297 289 <RenderingHints>
... ... @@ -301,12 +293,11 @@
301 293 <ParticleQuantity>CountRate</ParticleQuantity>
302 294 </Particle>
303 295 </Parameter>
304   -
305 296 <Parameter>
306   - <Name>al rate side C</Name>
307   - <ParameterKey>psp_let2_1h_Alr</ParameterKey>
  297 + <Name>ar rate side C</Name>
  298 + <ParameterKey>psp_let2_1h_Arr</ParameterKey>
308 299 <Description>
309   - Aluminium rate side C
  300 + Argon rate side C
310 301 </Description>
311 302 <Units>counts/s</Units>
312 303 <RenderingHints>
... ... @@ -316,12 +307,11 @@
316 307 <ParticleQuantity>CountRate</ParticleQuantity>
317 308 </Particle>
318 309 </Parameter>
319   -
320 310 <Parameter>
321   - <Name>mg rate side C</Name>
322   - <ParameterKey>psp_let2_1h_Mgr</ParameterKey>
  311 + <Name>ca rate side C</Name>
  312 + <ParameterKey>psp_let2_1h_Car</ParameterKey>
323 313 <Description>
324   - Magnesium rate side C
  314 + Calcium rate side C
325 315 </Description>
326 316 <Units>counts/s</Units>
327 317 <RenderingHints>
... ... @@ -331,12 +321,11 @@
331 321 <ParticleQuantity>CountRate</ParticleQuantity>
332 322 </Particle>
333 323 </Parameter>
334   -
335 324 <Parameter>
336   - <Name>ar rate side C</Name>
337   - <ParameterKey>psp_let2_1h_Arr</ParameterKey>
  325 + <Name>cr rate side C</Name>
  326 + <ParameterKey>psp_let2_1h_Crr</ParameterKey>
338 327 <Description>
339   - Argon rate side C
  328 + Chromium rate side C
340 329 </Description>
341 330 <Units>counts/s</Units>
342 331 <RenderingHints>
... ... @@ -346,12 +335,11 @@
346 335 <ParticleQuantity>CountRate</ParticleQuantity>
347 336 </Particle>
348 337 </Parameter>
349   -
350 338 <Parameter>
351   - <Name>na rate side C</Name>
352   - <ParameterKey>psp_let2_1h_Nar</ParameterKey>
  339 + <Name>ni rate side C</Name>
  340 + <ParameterKey>psp_let2_1h_Nir</ParameterKey>
353 341 <Description>
354   - Sodium rate side C
  342 + Nickel rate side C
355 343 </Description>
356 344 <Units>counts/s</Units>
357 345 <RenderingHints>
... ...