From cd3a5540771afdaca2c6bfd4c94bef59eb4db578 Mon Sep 17 00:00:00 2001
From: Alexandre Schulz <alexandre.schulz@irap.omp.eu>
Date: Mon, 22 Feb 2021 12:16:39 +0100
Subject: [PATCH] Redmine #8961 : mise en cohérence des noms de champs magnétiques, modifications approtées a omni-1min-all, omni-5min-all, omni-hour-all

---
 NumericalData/CDPP-AMDA/OMNI/omni-1min-all.xml | 11 +++++------
 NumericalData/CDPP-AMDA/OMNI/omni-5min-all.xml | 11 +++++------
 NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml | 17 ++++++++---------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/NumericalData/CDPP-AMDA/OMNI/omni-1min-all.xml b/NumericalData/CDPP-AMDA/OMNI/omni-1min-all.xml
index 987be87..d92fe67 100644
--- a/NumericalData/CDPP-AMDA/OMNI/omni-1min-all.xml
+++ b/NumericalData/CDPP-AMDA/OMNI/omni-1min-all.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -10,7 +9,7 @@
             <Description>1 min averaged, multi-source, near-Earth solar wind magnetic 
               field, plasma and energetic proton flux data, plus AE, AU, AL, Kp, ap, and Dst 
               geomagnetic indices, Polar Cap (Thule) index, F10.7 index, and Rz (sunspot number). 
-              The ram pressure is calculated using P=rho*Np*Vp², where rho=1.672622*(1+4*(1/(1-He++_ratio)-1)). 
+              The ram pressure is calculated using P=rho*Np*Vp&#178;, where rho=1.672622*(1+4*(1/(1-He++_ratio)-1)). 
               We use rho=2 here, which corresponds to a ratio of He++ between 4% and 5%.
             </Description>
             <Acknowledgement>We acknowledge the experiment teams that acquired, processed 
@@ -56,9 +55,9 @@ for creating the OMNI data set.</Acknowledgement>
         </TemporalDescription>
         <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
         <Parameter>
-            <Name>sw |b|</Name>
+            <Name>|b|</Name>
             <ParameterKey>omni1_imf_mag</ParameterKey>
-            <Description/>
+            <Description />
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
             <RenderingHints>
@@ -71,7 +70,7 @@ for creating the OMNI data set.</Acknowledgement>
             </Field>
         </Parameter>
         <Parameter>
-            <Name>sw b_gse</Name>
+            <Name>b_gse</Name>
             <ParameterKey>omni1_imf</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -209,4 +208,4 @@ for creating the OMNI data set.</Acknowledgement>
             </Particle>
         </Parameter>
       </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/OMNI/omni-5min-all.xml b/NumericalData/CDPP-AMDA/OMNI/omni-5min-all.xml
index 508b686..ee356c3 100644
--- a/NumericalData/CDPP-AMDA/OMNI/omni-5min-all.xml
+++ b/NumericalData/CDPP-AMDA/OMNI/omni-5min-all.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -54,9 +53,9 @@ for creating the OMNI data set.</Acknowledgement>
         </TemporalDescription>
         <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
         <Parameter>
-            <Name>sw |b|</Name>
+            <Name>|b|</Name>
             <ParameterKey>omni5_imf_mag</ParameterKey>
-            <Description/>
+            <Description />
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
             <RenderingHints>
@@ -68,7 +67,7 @@ for creating the OMNI data set.</Acknowledgement>
             </Field>
         </Parameter>
         <Parameter>
-            <Name>sw b_gse</Name>
+            <Name>b_gse</Name>
             <ParameterKey>omni5_imf</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -231,7 +230,7 @@ for creating the OMNI data set.</Acknowledgement>
     <Parameter>
             <Name>sw integral proton fluxes</Name>
             <ParameterKey>omni_5min_pflux</ParameterKey>
-            <Ucd/>
+            <Ucd />
             <RenderingHints>
                 <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
@@ -255,4 +254,4 @@ for creating the OMNI data set.</Acknowledgement>
         </Structure>
         </Parameter>
       </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml b/NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml
index a4bc884..429aa0e 100644
--- a/NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml
+++ b/NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -54,9 +53,9 @@ for creating the OMNI data set.</Acknowledgement>
         </TemporalDescription>
         <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
         <Parameter>
-            <Name>sw average b magn</Name>
+            <Name>|b|</Name>
             <ParameterKey>omni_imf_mag</ParameterKey>
-            <Description/>
+            <Description />
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
             <RenderingHints>
@@ -70,7 +69,7 @@ for creating the OMNI data set.</Acknowledgement>
         <Parameter>
             <Name>sw average b magn (vec)</Name>
             <ParameterKey>omni_imf_mag_vec</ParameterKey>
-            <Description/>
+            <Description />
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
             <RenderingHints>
@@ -82,7 +81,7 @@ for creating the OMNI data set.</Acknowledgement>
             </Field>
         </Parameter>
         <Parameter>
-            <Name>sw b_gse</Name>
+            <Name>b_gse</Name>
             <ParameterKey>omni_imf</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -268,8 +267,8 @@ for creating the OMNI data set.</Acknowledgement>
         <Parameter>
             <Name>F10.7 solar index</Name>
             <ParameterKey>omni_f107</ParameterKey>
-            <Description/>
-            <Ucd/>
+            <Description />
+            <Ucd />
             <Units>10e-22 W/m^2/Hz</Units>
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
@@ -281,7 +280,7 @@ for creating the OMNI data set.</Acknowledgement>
         <Parameter>
             <Name>sw integral proton fluxes</Name>
             <ParameterKey>omni_hour_pflux</ParameterKey>
-            <Description/>
+            <Description />
             <Ucd>phys.count</Ucd>
             <RenderingHints>
                 <DisplayType>StackPlot</DisplayType>
@@ -324,4 +323,4 @@ for creating the OMNI data set.</Acknowledgement>
             </Support>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
--
libgit2 0.21.2