From 1f0ec65b78842dde8006157e464ce5417f2afa40 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Wed, 28 Apr 2021 10:04:44 +0200
Subject: [PATCH] Merge OMNI & Solar Orbiter (MAG) datasets from amdadev
---
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 ++++++++---------
NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml | 34 ++++++++++++++++++++++++++++++++--
NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml | 31 ++++++++++++++++++++++++++++++-
NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml | 47 ++++++++++++++++++++++++++++++++++++++++-------
6 files changed, 120 insertions(+), 31 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², 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
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml
index 12be95c..f9261d9 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml
@@ -32,7 +32,7 @@
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
<Availability>Online</Availability>
- <AccessRights>Open</AccessRights>
+ <AccessRights>PartiallyRestricted</AccessRights>
<AccessURL>
<Name>AMDA at CDPP</Name>
<URL>http://amda.cdpp.eu</URL>
@@ -119,7 +119,37 @@
<RenderingHints>
<DisplayType>TimeSeries</DisplayType>
</RenderingHints>
- </Parameter>
+ </Parameter>
+
+ <Parameter>
+ <Name>phi</Name>
+ <ParameterKey>solo_b_rtn_phi</ParameterKey>
+ <Description>
+ Magnetic field phi angle
+ </Description>
+ <Ucd>phys.magField</Ucd>
+ <Units>degrees</Units>
+ <UnitsConversion>1e-9>T</UnitsConversion>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ </Parameter>
+
+ <Parameter>
+ <Name>theta</Name>
+ <ParameterKey>solo_b_rtn_theta</ParameterKey>
+ <Description>
+ Magnetic field theta angle
+ </Description>
+ <Ucd>phys.magField</Ucd>
+ <Units>degrees</Units>
+ <UnitsConversion>1e-9>T</UnitsConversion>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ </Parameter>
+
+
<Parameter>
<Name>quality</Name>
<ParameterKey>solo_b_rtn_qf</ParameterKey>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml
index aa903b0..c7738e7 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml
@@ -32,7 +32,7 @@
<AccessInformation>
<RepositoryID>spase://SMWG/Repository/CNES/CDPP-AMDA</RepositoryID>
<Availability>Online</Availability>
- <AccessRights>Open</AccessRights>
+ <AccessRights>PartiallyRestricted</AccessRights>
<AccessURL>
<Name>AMDA at CDPP</Name>
<URL>http://amda.cdpp.eu</URL>
@@ -120,6 +120,35 @@
<DisplayType>TimeSeries</DisplayType>
</RenderingHints>
</Parameter>
+
+ <Parameter>
+ <Name>phi</Name>
+ <ParameterKey>solo_b_rtn_hr_phi</ParameterKey>
+ <Description>
+ Magnetic field phi angle
+ </Description>
+ <Ucd>phys.magField</Ucd>
+ <Units>degrees</Units>
+ <UnitsConversion>1e-9>T</UnitsConversion>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ </Parameter>
+
+ <Parameter>
+ <Name>theta</Name>
+ <ParameterKey>solo_b_rtn_hr_theta</ParameterKey>
+ <Description>
+ Magnetic field theta angle
+ </Description>
+ <Ucd>phys.magField</Ucd>
+ <Units>degrees</Units>
+ <UnitsConversion>1e-9>T</UnitsConversion>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ </Parameter>
+
<Parameter>
<Name>quality</Name>
<ParameterKey>solo_b_rtn_hr_qf</ParameterKey>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
index 2e308e1..b84d99f 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.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://www.spase-group.org/data/schema/spase-2_3_0.xsd">
<Version>2.3.0</Version>
<NumericalData>
@@ -21,7 +20,7 @@
ESA archive from September 2020.
</Description>
- <Acknowledgement></Acknowledgement>
+ <Acknowledgement />
<Contact>
<PersonID>spase://CDPP/Person/Tim.Horbury</PersonID>
<Role>PrincipalInvestigator</Role>
@@ -29,7 +28,7 @@
<InformationURL>
<Name>Low Latency Data</Name>
<URL>https://www.cosmos.esa.int/web/solar-orbiter/access-to-solar-orbiter-low-latency-data</URL>
- <Description></Description>
+ <Description />
</InformationURL>
</ResourceHeader>
<AccessInformation>
@@ -77,7 +76,7 @@
<Parameter>
<Name>b_rtn</Name>
<ParameterKey>solo_b_rtn_8s</ParameterKey>
- <Description/>
+ <Description />
<Ucd>phys.magField</Ucd>
<Units>nT</Units>
<UnitsConversion>1e-9>T</UnitsConversion>
@@ -120,7 +119,7 @@
<Parameter>
<Name>b_srf</Name>
<ParameterKey>solo_b_srf_8s</ParameterKey>
- <Description/>
+ <Description />
<Ucd>phys.magField</Ucd>
<Units>nT</Units>
<UnitsConversion>1e-9>T</UnitsConversion>
@@ -176,5 +175,39 @@
<Size>1</Size>
</Structure>
</Parameter>
-</NumericalData>
-</Spase>
+
+ <Parameter>
+ <Name>psi</Name>
+ <ParameterKey>solo_b_rtn_8s_phi</ParameterKey>
+ <Description>
+ Magnetic field psi angle
+ </Description>
+ <Units>degrees</Units>
+ <UnitsConversion>1e-9>T</UnitsConversion>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Structure>
+ <Size>1</Size>
+ </Structure>
+ </Parameter>
+
+ <Parameter>
+ <Name>theta</Name>
+ <ParameterKey>solo_b_rtn_8s_theta</ParameterKey>
+ <Description>
+ Magnetic field theta angle
+ </Description>
+ <Ucd>phys.magField</Ucd>
+ <Units>degrees</Units>
+ <UnitsConversion>1e-9>T</UnitsConversion>
+ <RenderingHints>
+ <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Structure>
+ <Size>1</Size>
+ </Structure>
+ </Parameter>
+
+<Parameter><Name>phi</Name><ParameterKey>solo_b_rtn_8s_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>solo_b_rtn_8s_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
--
libgit2 0.21.2