CDPP / CNES

Commit a44de325ce253a837d7ab8fe7c20d2363e413cf3

Authored by Benjamin Renard
1 parent afb5c8e9
Exists in master and in 10 other branches amdadev, autocommit, bepi_master, bepi_update, cleanup_registry, cleanup_registry_master, cleanup_registry_merged, juice_jdc, juno_jade, soar

Merge Cassini datasets from amdadev

Showing 5 changed files with 37 additions and 14 deletions   Show diff stats
Inline Side-by-side
NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
  Diff comments   View file @a44de32
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 <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"> 1 <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">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -195,5 +194,5 @@ @@ -195,5 +194,5 @@
195 <FieldQuantity>Magnetic</FieldQuantity> 194 <FieldQuantity>Magnetic</FieldQuantity>
196 </Field> 195 </Field>
197 </Parameter> 196 </Parameter>
198 - </NumericalData>  
199 -</Spase> 197 + <Parameter><Name>phi</Name><ParameterKey>cass_b_rtn1s_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_rtn1s_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
  198 +</Spase>
200 \ No newline at end of file 199 \ No newline at end of file
NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
  Diff comments   View file @a44de32
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 <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"> 1 <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">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -195,5 +194,5 @@ @@ -195,5 +194,5 @@
195 <FieldQuantity>Magnetic</FieldQuantity> 194 <FieldQuantity>Magnetic</FieldQuantity>
196 </Field> 195 </Field>
197 </Parameter> 196 </Parameter>
198 - </NumericalData>  
199 -</Spase> 197 + <Parameter><Name>phi</Name><ParameterKey>cass_b_rtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_rtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
  198 +</Spase>
200 \ No newline at end of file 199 \ No newline at end of file
NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
  Diff comments   View file @a44de32
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 <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"> 1 <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">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -158,5 +157,5 @@ Removal of these signals is at the user&#39;s discretion.&lt;/Caveats&gt; @@ -158,5 +157,5 @@ Removal of these signals is at the user&#39;s discretion.&lt;/Caveats&gt;
158 <FieldQuantity>Magnetic</FieldQuantity> 157 <FieldQuantity>Magnetic</FieldQuantity>
159 </Field> 158 </Field>
160 </Parameter> 159 </Parameter>
161 - </NumericalData>  
162 -</Spase> 160 + <Parameter><Name>phi</Name><ParameterKey>cass_b_jup_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_jup_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
  161 +</Spase>
163 \ No newline at end of file 162 \ No newline at end of file
NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
  Diff comments   View file @a44de32
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 <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"> 1 <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">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -93,5 +92,33 @@ @@ -93,5 +92,33 @@
93 <FieldQuantity>Magnetic</FieldQuantity> 92 <FieldQuantity>Magnetic</FieldQuantity>
94 </Field> 93 </Field>
95 </Parameter> 94 </Parameter>
96 - </NumericalData> 95 + <Parameter>
  96 + <Name>phi</Name>
  97 + <ParameterKey>cass_b_rtn1_phi</ParameterKey>
  98 + <Description>Magnetic field phi angle</Description>
  99 + <Ucd>phys.magField</Ucd>
  100 + <Units>degrees</Units>
  101 + <UnitsConversion>1e-9&amp;gt;T</UnitsConversion>
  102 + <RenderingHints>
  103 + <DisplayType>TimeSeries</DisplayType>
  104 + </RenderingHints>
  105 + <Structure>
  106 + <Size>1</Size>
  107 +</Structure>
  108 + </Parameter>
  109 + <Parameter>
  110 + <Name>theta</Name>
  111 + <ParameterKey>cass_b_rtn1_theta</ParameterKey>
  112 + <Description>Magnetic field theta angle</Description>
  113 + <Ucd>phys.magField</Ucd>
  114 + <Units>degrees</Units>
  115 + <UnitsConversion>1e-9&amp;gt;T</UnitsConversion>
  116 + <RenderingHints>
  117 + <DisplayType>TimeSeries</DisplayType>
  118 + </RenderingHints>
  119 + <Structure>
  120 + <Size>1</Size>
  121 + </Structure>
  122 +</Parameter>
  123 +</NumericalData>
97 </Spase> 124 </Spase>
NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
  Diff comments   View file @a44de32
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 <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"> 1 <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">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -93,5 +92,5 @@ @@ -93,5 +92,5 @@
93 <FieldQuantity>Magnetic</FieldQuantity> 92 <FieldQuantity>Magnetic</FieldQuantity>
94 </Field> 93 </Field>
95 </Parameter> 94 </Parameter>
96 - </NumericalData>  
97 -</Spase> 95 + <Parameter><Name>phi</Name><ParameterKey>cass_b_rtn60_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_rtn60_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
  96 +</Spase>
98 \ No newline at end of file 97 \ No newline at end of file