From c75c7074bd8ed4be0456a43208962fe113305210 Mon Sep 17 00:00:00 2001
From: Quentin Brzustowski <quentin.brzustowski@irap.omp.eu>
Date: Tue, 3 Mar 2020 12:10:28 +0100
Subject: [PATCH] modified order of species in epiHi
---
NumericalData/CDPP-AMDA/PSP/epiHi/psp-het-1hr.xml | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------
NumericalData/CDPP-AMDA/PSP/epiHi/psp-let1-1hr.xml | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------
NumericalData/CDPP-AMDA/PSP/epiHi/psp-let2-1hr.xml | 100 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
3 files changed, 238 insertions(+), 237 deletions(-)
diff --git a/NumericalData/CDPP-AMDA/PSP/epiHi/psp-het-1hr.xml b/NumericalData/CDPP-AMDA/PSP/epiHi/psp-het-1hr.xml
index e5d4e90..975e981 100644
--- a/NumericalData/CDPP-AMDA/PSP/epiHi/psp-het-1hr.xml
+++ b/NumericalData/CDPP-AMDA/PSP/epiHi/psp-het-1hr.xml
@@ -183,11 +183,12 @@
<ParticleQuantity>EnergyFlux</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>e- rate side A</Name>
- <ParameterKey>psp_het_1h_Aer</ParameterKey>
+ <Name>h+ rate side A</Name>
+ <ParameterKey>psp_het_1h_AHr</ParameterKey>
<Description>
- Electrons rate side A
+ proton rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -198,10 +199,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>e- rate side B</Name>
- <ParameterKey>psp_het_1h_Ber</ParameterKey>
+ <Name>h+ rate side B</Name>
+ <ParameterKey>psp_het_1h_BHr</ParameterKey>
<Description>
- Electrons rate side B
+ proton rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -212,10 +213,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>h+ rate side A</Name>
- <ParameterKey>psp_het_1h_AHr</ParameterKey>
+ <Name>e- rate side A</Name>
+ <ParameterKey>psp_het_1h_Aer</ParameterKey>
<Description>
- proton rate side A
+ Electrons rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -226,10 +227,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>h+ rate side B</Name>
- <ParameterKey>psp_het_1h_BHr</ParameterKey>
+ <Name>e- rate side B</Name>
+ <ParameterKey>psp_het_1h_Ber</ParameterKey>
<Description>
- proton rate side B
+ Electrons rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -267,11 +268,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>si rate side A</Name>
- <ParameterKey>psp_het_1h_ASir</ParameterKey>
+ <Name>c rate side A</Name>
+ <ParameterKey>psp_het_1h_ACr</ParameterKey>
<Description>
- Silicon rate side A
+ Carbon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -282,10 +284,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>si rate side B</Name>
- <ParameterKey>psp_het_1h_BSir</ParameterKey>
+ <Name>c rate side B</Name>
+ <ParameterKey>psp_het_1h_BCr</ParameterKey>
<Description>
- Silicon rate side B
+ Carbon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -296,10 +298,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>c rate side A</Name>
- <ParameterKey>psp_het_1h_ACr</ParameterKey>
+ <Name>o rate side A</Name>
+ <ParameterKey>psp_het_1h_AOr</ParameterKey>
<Description>
- Carbon rate side A
+ Oxygen rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -310,10 +312,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>c rate side B</Name>
- <ParameterKey>psp_het_1h_BCr</ParameterKey>
+ <Name>o rate side B</Name>
+ <ParameterKey>psp_het_1h_BOr</ParameterKey>
<Description>
- Carbon rate side B
+ Oxygen rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -324,10 +326,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>n rate side A</Name>
- <ParameterKey>psp_het_1h_ANr</ParameterKey>
+ <Name>fe rate side A</Name>
+ <ParameterKey>psp_het_1h_AFer</ParameterKey>
<Description>
- Nitrogen rate side A
+ Iron rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -338,10 +340,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>n rate side B</Name>
- <ParameterKey>psp_het_1h_BNr</ParameterKey>
+ <Name>fe rate side B</Name>
+ <ParameterKey>psp_het_1h_BFer</ParameterKey>
<Description>
- Nitrogen rate side B
+ Iron rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -351,11 +353,13 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
+
<Parameter>
- <Name>ne rate side A</Name>
- <ParameterKey>psp_het_1h_ANer</ParameterKey>
+ <Name>n rate side A</Name>
+ <ParameterKey>psp_het_1h_ANr</ParameterKey>
<Description>
- Neon rate side A
+ Nitrogen rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -366,10 +370,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ne rate side B</Name>
- <ParameterKey>psp_het_1h_BNer</ParameterKey>
+ <Name>n rate side B</Name>
+ <ParameterKey>psp_het_1h_BNr</ParameterKey>
<Description>
- Neon rate side B
+ Nitrogen rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -380,10 +384,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>s rate side A</Name>
- <ParameterKey>psp_het_1h_ASr</ParameterKey>
+ <Name>ne rate side A</Name>
+ <ParameterKey>psp_het_1h_ANer</ParameterKey>
<Description>
- Sulfur rate side A
+ Neon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -394,10 +398,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>s rate side B</Name>
- <ParameterKey>psp_het_1h_BSr</ParameterKey>
+ <Name>ne rate side B</Name>
+ <ParameterKey>psp_het_1h_BNer</ParameterKey>
<Description>
- Sulfur rate side B
+ Neon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -408,10 +412,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>fe rate side A</Name>
- <ParameterKey>psp_het_1h_AFer</ParameterKey>
+ <Name>na rate side A</Name>
+ <ParameterKey>psp_het_1h_ANar</ParameterKey>
<Description>
- Iron rate side A
+ Sodium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -422,10 +426,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>fe rate side B</Name>
- <ParameterKey>psp_het_1h_BFer</ParameterKey>
+ <Name>na rate side B</Name>
+ <ParameterKey>psp_het_1h_BNar</ParameterKey>
<Description>
- Iron rate side B
+ Sodium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -435,11 +439,14 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
+
+
<Parameter>
- <Name>cr rate side A</Name>
- <ParameterKey>psp_het_1h_ACrr</ParameterKey>
+ <Name>mg rate side A</Name>
+ <ParameterKey>psp_het_1h_AMgr</ParameterKey>
<Description>
- Chromium rate side A
+ Magnesium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -450,10 +457,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>cr rate side B</Name>
- <ParameterKey>psp_het_1h_BCrr</ParameterKey>
+ <Name>mg rate side B</Name>
+ <ParameterKey>psp_het_1h_BMgr</ParameterKey>
<Description>
- Chromium rate side B
+ Magnesium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -463,11 +470,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>o rate side A</Name>
- <ParameterKey>psp_het_1h_AOr</ParameterKey>
+ <Name>al rate side A</Name>
+ <ParameterKey>psp_het_1h_AAlr</ParameterKey>
<Description>
- Oxygen rate side A
+ Aluminium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -478,10 +486,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>o rate side B</Name>
- <ParameterKey>psp_het_1h_BOr</ParameterKey>
+ <Name>al rate side B</Name>
+ <ParameterKey>psp_het_1h_BAlr</ParameterKey>
<Description>
- Oxygen rate side B
+ Aluminium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -492,10 +500,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ni rate side A</Name>
- <ParameterKey>psp_het_1h_ANir</ParameterKey>
+ <Name>si rate side A</Name>
+ <ParameterKey>psp_het_1h_ASir</ParameterKey>
<Description>
- Nickel rate side A
+ Silicon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -506,10 +514,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ni rate side B</Name>
- <ParameterKey>psp_het_1h_BNir</ParameterKey>
+ <Name>si rate side B</Name>
+ <ParameterKey>psp_het_1h_BSir</ParameterKey>
<Description>
- Nickel rate side B
+ Silicon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -520,10 +528,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ca rate side A</Name>
- <ParameterKey>psp_het_1h_ACar</ParameterKey>
+ <Name>s rate side A</Name>
+ <ParameterKey>psp_het_1h_ASr</ParameterKey>
<Description>
- Calcium rate side A
+ Sulfur rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -534,10 +542,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ca rate side B</Name>
- <ParameterKey>psp_het_1h_BCar</ParameterKey>
+ <Name>s rate side B</Name>
+ <ParameterKey>psp_het_1h_BSr</ParameterKey>
<Description>
- Calcium rate side B
+ Sulfur rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -547,11 +555,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>al rate side A</Name>
- <ParameterKey>psp_het_1h_AAlr</ParameterKey>
+ <Name>ar rate side A</Name>
+ <ParameterKey>psp_het_1h_AArr</ParameterKey>
<Description>
- Aluminium rate side A
+ Argon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -562,10 +571,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>al rate side B</Name>
- <ParameterKey>psp_het_1h_BAlr</ParameterKey>
+ <Name>ar rate side B</Name>
+ <ParameterKey>psp_het_1h_BArr</ParameterKey>
<Description>
- Aluminium rate side B
+ Argon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -576,10 +585,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>mg rate side A</Name>
- <ParameterKey>psp_het_1h_AMgr</ParameterKey>
+ <Name>ca rate side A</Name>
+ <ParameterKey>psp_het_1h_ACar</ParameterKey>
<Description>
- Magnesium rate side A
+ Calcium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -590,10 +599,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>mg rate side B</Name>
- <ParameterKey>psp_het_1h_BMgr</ParameterKey>
+ <Name>ca rate side B</Name>
+ <ParameterKey>psp_het_1h_BCar</ParameterKey>
<Description>
- Magnesium rate side B
+ Calcium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -603,12 +612,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>ar rate side A</Name>
- <ParameterKey>psp_het_1h_AArr</ParameterKey>
+ <Name>cr rate side A</Name>
+ <ParameterKey>psp_het_1h_ACrr</ParameterKey>
<Description>
- Argon rate side A
+ Chromium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -619,10 +627,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ar rate side B</Name>
- <ParameterKey>psp_het_1h_BArr</ParameterKey>
+ <Name>cr rate side B</Name>
+ <ParameterKey>psp_het_1h_BCrr</ParameterKey>
<Description>
- Argon rate side B
+ Chromium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -632,11 +640,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>na rate side A</Name>
- <ParameterKey>psp_het_1h_ANar</ParameterKey>
+ <Name>ni rate side A</Name>
+ <ParameterKey>psp_het_1h_ANir</ParameterKey>
<Description>
- Sodium rate side A
+ Nickel rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -647,10 +656,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>na rate side B</Name>
- <ParameterKey>psp_het_1h_BNar</ParameterKey>
+ <Name>ni rate side B</Name>
+ <ParameterKey>psp_het_1h_BNir</ParameterKey>
<Description>
- Sodium rate side B
+ Nickel rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let1-1hr.xml b/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let1-1hr.xml
index 9bb45d5..2b4d6ee 100644
--- a/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let1-1hr.xml
+++ b/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let1-1hr.xml
@@ -237,10 +237,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>si rate side A</Name>
- <ParameterKey>psp_let1_1h_ASir</ParameterKey>
+ <Name>c rate side A</Name>
+ <ParameterKey>psp_let1_1h_ACr</ParameterKey>
<Description>
- Silicon rate side A
+ Carbon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -251,10 +251,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>si rate side B</Name>
- <ParameterKey>psp_let1_1h_BSir</ParameterKey>
+ <Name>c rate side B</Name>
+ <ParameterKey>psp_let1_1h_BCr</ParameterKey>
<Description>
- Silicon rate side B
+ Carbon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -265,10 +265,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>c rate side A</Name>
- <ParameterKey>psp_let1_1h_ACr</ParameterKey>
+ <Name>o rate side A</Name>
+ <ParameterKey>psp_let1_1h_AOr</ParameterKey>
<Description>
- Carbon rate side A
+ Oxygen rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -279,10 +279,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>c rate side B</Name>
- <ParameterKey>psp_let1_1h_BCr</ParameterKey>
+ <Name>o rate side B</Name>
+ <ParameterKey>psp_let1_1h_BOr</ParameterKey>
<Description>
- Carbon rate side B
+ Oxygen rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -293,10 +293,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>n rate side A</Name>
- <ParameterKey>psp_let1_1h_ANr</ParameterKey>
+ <Name>fe rate side A</Name>
+ <ParameterKey>psp_let1_1h_AFer</ParameterKey>
<Description>
- Nitrogen rate side A
+ Iron rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -307,10 +307,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>n rate side B</Name>
- <ParameterKey>psp_let1_1h_BNr</ParameterKey>
+ <Name>fe rate side B</Name>
+ <ParameterKey>psp_let1_1h_BFer</ParameterKey>
<Description>
- Nitrogen rate side B
+ Iron rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -320,11 +320,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>ne rate side A</Name>
- <ParameterKey>psp_let1_1h_ANer</ParameterKey>
+ <Name>n rate side A</Name>
+ <ParameterKey>psp_let1_1h_ANr</ParameterKey>
<Description>
- Neon rate side A
+ Nitrogen rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -335,10 +336,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ne rate side B</Name>
- <ParameterKey>psp_let1_1h_BNer</ParameterKey>
+ <Name>n rate side B</Name>
+ <ParameterKey>psp_let1_1h_BNr</ParameterKey>
<Description>
- Neon rate side B
+ Nitrogen rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -349,10 +350,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>s rate side A</Name>
- <ParameterKey>psp_let1_1h_ASr</ParameterKey>
+ <Name>ne rate side A</Name>
+ <ParameterKey>psp_let1_1h_ANer</ParameterKey>
<Description>
- Sulfur rate side A
+ Neon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -363,10 +364,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>s rate side B</Name>
- <ParameterKey>psp_let1_1h_BSr</ParameterKey>
+ <Name>ne rate side B</Name>
+ <ParameterKey>psp_let1_1h_BNer</ParameterKey>
<Description>
- Sulfur rate side B
+ Neon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -377,10 +378,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>fe rate side A</Name>
- <ParameterKey>psp_let1_1h_AFer</ParameterKey>
+ <Name>na rate side A</Name>
+ <ParameterKey>psp_let1_1h_ANar</ParameterKey>
<Description>
- Iron rate side A
+ Sodium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -391,10 +392,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>fe rate side B</Name>
- <ParameterKey>psp_let1_1h_BFer</ParameterKey>
+ <Name>na rate side B</Name>
+ <ParameterKey>psp_let1_1h_BNar</ParameterKey>
<Description>
- Iron rate side B
+ Sodium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -404,11 +405,13 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
+
<Parameter>
- <Name>cr rate side A</Name>
- <ParameterKey>psp_let1_1h_ACrr</ParameterKey>
+ <Name>mg rate side A</Name>
+ <ParameterKey>psp_let1_1h_AMgr</ParameterKey>
<Description>
- Chromium rate side A
+ Magnesium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -419,10 +422,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>cr rate side B</Name>
- <ParameterKey>psp_let1_1h_BCrr</ParameterKey>
+ <Name>mg rate side B</Name>
+ <ParameterKey>psp_let1_1h_BMgr</ParameterKey>
<Description>
- Chromium rate side B
+ Magnesium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -433,10 +436,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>o rate side A</Name>
- <ParameterKey>psp_let1_1h_AOr</ParameterKey>
+ <Name>al rate side A</Name>
+ <ParameterKey>psp_let1_1h_AAlr</ParameterKey>
<Description>
- Oxygen rate side A
+ Aluminium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -447,10 +450,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>o rate side B</Name>
- <ParameterKey>psp_let1_1h_BOr</ParameterKey>
+ <Name>al rate side B</Name>
+ <ParameterKey>psp_let1_1h_BAlr</ParameterKey>
<Description>
- Oxygen rate side B
+ Aluminium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -461,10 +464,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ni rate side A</Name>
- <ParameterKey>psp_let1_1h_ANir</ParameterKey>
+ <Name>si rate side A</Name>
+ <ParameterKey>psp_let1_1h_ASir</ParameterKey>
<Description>
- Nickel rate side A
+ Silicon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -475,10 +478,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ni rate side B</Name>
- <ParameterKey>psp_let1_1h_BNir</ParameterKey>
+ <Name>si rate side B</Name>
+ <ParameterKey>psp_let1_1h_BSir</ParameterKey>
<Description>
- Nickel rate side B
+ Silicon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -489,10 +492,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ca rate side A</Name>
- <ParameterKey>psp_let1_1h_ACar</ParameterKey>
+ <Name>s rate side A</Name>
+ <ParameterKey>psp_let1_1h_ASr</ParameterKey>
<Description>
- Calcium rate side A
+ Sulfur rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -503,10 +506,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ca rate side B</Name>
- <ParameterKey>psp_let1_1h_BCar</ParameterKey>
+ <Name>s rate side B</Name>
+ <ParameterKey>psp_let1_1h_BSr</ParameterKey>
<Description>
- Calcium rate side B
+ Sulfur rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -517,10 +520,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>al rate side A</Name>
- <ParameterKey>psp_let1_1h_AAlr</ParameterKey>
+ <Name>ar rate side A</Name>
+ <ParameterKey>psp_let1_1h_AArr</ParameterKey>
<Description>
- Aluminium rate side A
+ Argon rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -531,10 +534,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>al rate side B</Name>
- <ParameterKey>psp_let1_1h_BAlr</ParameterKey>
+ <Name>ar rate side B</Name>
+ <ParameterKey>psp_let1_1h_BArr</ParameterKey>
<Description>
- Aluminium rate side B
+ Argon rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -545,10 +548,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>mg rate side A</Name>
- <ParameterKey>psp_let1_1h_AMgr</ParameterKey>
+ <Name>ca rate side A</Name>
+ <ParameterKey>psp_let1_1h_ACar</ParameterKey>
<Description>
- Magnesium rate side A
+ Calcium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -559,10 +562,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>mg rate side B</Name>
- <ParameterKey>psp_let1_1h_BMgr</ParameterKey>
+ <Name>ca rate side B</Name>
+ <ParameterKey>psp_let1_1h_BCar</ParameterKey>
<Description>
- Magnesium rate side B
+ Calcium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -573,10 +576,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ar rate side A</Name>
- <ParameterKey>psp_let1_1h_AArr</ParameterKey>
+ <Name>cr rate side A</Name>
+ <ParameterKey>psp_let1_1h_ACrr</ParameterKey>
<Description>
- Argon rate side A
+ Chromium rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -587,10 +590,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>ar rate side B</Name>
- <ParameterKey>psp_let1_1h_BArr</ParameterKey>
+ <Name>cr rate side B</Name>
+ <ParameterKey>psp_let1_1h_BCrr</ParameterKey>
<Description>
- Argon rate side B
+ Chromium rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -600,11 +603,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
+
<Parameter>
- <Name>na rate side A</Name>
- <ParameterKey>psp_let1_1h_ANar</ParameterKey>
+ <Name>ni rate side A</Name>
+ <ParameterKey>psp_let1_1h_ANir</ParameterKey>
<Description>
- Sodium rate side A
+ Nickel rate side A
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -615,10 +619,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>na rate side B</Name>
- <ParameterKey>psp_let1_1h_BNar</ParameterKey>
+ <Name>ni rate side B</Name>
+ <ParameterKey>psp_let1_1h_BNir</ParameterKey>
<Description>
- Sodium rate side B
+ Nickel rate side B
</Description>
<Units>counts/s</Units>
<RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let2-1hr.xml b/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let2-1hr.xml
index aa3dfde..9e6b63b 100644
--- a/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let2-1hr.xml
+++ b/NumericalData/CDPP-AMDA/PSP/epiHi/psp-let2-1hr.xml
@@ -153,10 +153,10 @@
</Particle>
</Parameter>
<Parameter>
- <Name>si rate side C</Name>
- <ParameterKey>psp_let2_1h_Sir</ParameterKey>
+ <Name>c rate side C</Name>
+ <ParameterKey>psp_let2_1h_Cr</ParameterKey>
<Description>
- Silicon rate side C
+ Carbon rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -166,12 +166,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>c rate side C</Name>
- <ParameterKey>psp_let2_1h_Cr</ParameterKey>
+ <Name>o rate side C</Name>
+ <ParameterKey>psp_let2_1h_Or</ParameterKey>
<Description>
- Carbon rate side C
+ Oxygen rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -181,12 +180,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>n rate side C</Name>
- <ParameterKey>psp_let2_1h_Nr</ParameterKey>
+ <Name>fe rate side C</Name>
+ <ParameterKey>psp_let2_1h_Fer</ParameterKey>
<Description>
- Nitrogen rate side C
+ Iron rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -196,12 +194,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>ne rate side C</Name>
- <ParameterKey>psp_let2_1h_Ner</ParameterKey>
+ <Name>n rate side C</Name>
+ <ParameterKey>psp_let2_1h_Nr</ParameterKey>
<Description>
- Neon rate side C
+ Nitrogen rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -211,12 +208,12 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
+
<Parameter>
- <Name>s rate side C</Name>
- <ParameterKey>psp_let2_1h_Sr</ParameterKey>
+ <Name>ne rate side C</Name>
+ <ParameterKey>psp_let2_1h_Ner</ParameterKey>
<Description>
- Sulfur rate side C
+ Neon rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -226,12 +223,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>fe rate side C</Name>
- <ParameterKey>psp_let2_1h_Fer</ParameterKey>
+ <Name>na rate side C</Name>
+ <ParameterKey>psp_let2_1h_Nar</ParameterKey>
<Description>
- Iron rate side C
+ Sodium rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -241,12 +237,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
- <Parameter>
- <Name>cr rate side C</Name>
- <ParameterKey>psp_let2_1h_Crr</ParameterKey>
+ <Parameter>
+ <Name>mg rate side C</Name>
+ <ParameterKey>psp_let2_1h_Mgr</ParameterKey>
<Description>
- Chromium rate side C
+ Magnesium rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -256,12 +251,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>o rate side C</Name>
- <ParameterKey>psp_let2_1h_Or</ParameterKey>
+ <Name>al rate side C</Name>
+ <ParameterKey>psp_let2_1h_Alr</ParameterKey>
<Description>
- Oxygen rate side C
+ Aluminium rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -271,12 +265,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>ni rate side C</Name>
- <ParameterKey>psp_let2_1h_Nir</ParameterKey>
+ <Name>si rate side C</Name>
+ <ParameterKey>psp_let2_1h_Sir</ParameterKey>
<Description>
- Nickel rate side C
+ Silicon rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -286,12 +279,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>ca rate side C</Name>
- <ParameterKey>psp_let2_1h_Car</ParameterKey>
+ <Name>s rate side C</Name>
+ <ParameterKey>psp_let2_1h_Sr</ParameterKey>
<Description>
- Calcium rate side C
+ Sulfur rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -301,12 +293,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>al rate side C</Name>
- <ParameterKey>psp_let2_1h_Alr</ParameterKey>
+ <Name>ar rate side C</Name>
+ <ParameterKey>psp_let2_1h_Arr</ParameterKey>
<Description>
- Aluminium rate side C
+ Argon rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -316,12 +307,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>mg rate side C</Name>
- <ParameterKey>psp_let2_1h_Mgr</ParameterKey>
+ <Name>ca rate side C</Name>
+ <ParameterKey>psp_let2_1h_Car</ParameterKey>
<Description>
- Magnesium rate side C
+ Calcium rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -331,12 +321,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>ar rate side C</Name>
- <ParameterKey>psp_let2_1h_Arr</ParameterKey>
+ <Name>cr rate side C</Name>
+ <ParameterKey>psp_let2_1h_Crr</ParameterKey>
<Description>
- Argon rate side C
+ Chromium rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
@@ -346,12 +335,11 @@
<ParticleQuantity>CountRate</ParticleQuantity>
</Particle>
</Parameter>
-
<Parameter>
- <Name>na rate side C</Name>
- <ParameterKey>psp_let2_1h_Nar</ParameterKey>
+ <Name>ni rate side C</Name>
+ <ParameterKey>psp_let2_1h_Nir</ParameterKey>
<Description>
- Sodium rate side C
+ Nickel rate side C
</Description>
<Units>counts/s</Units>
<RenderingHints>
--
libgit2 0.21.2