Commit 1fb505acaf9c802e1d398f549e35e5d890afed2f

Authored by Benjamin Renard
2 parents 17b7827f e1e7d33e

Merge branch 'master' into soar

NumericalData/CDPP-AMDA/ARTEMIS/P2/Ephemeris/athp2-orb-all.xml
... ... @@ -72,17 +72,17 @@
72 72 <Element>
73 73 <Name>x</Name>
74 74 <Index>1</Index>
75   - <ParameterKey>athp2_xyz(0)</ParameterKey>
  75 + <ParameterKey>athp2_xyz_gse(0)</ParameterKey>
76 76 </Element>
77 77 <Element>
78 78 <Name>y</Name>
79 79 <Index>2</Index>
80   - <ParameterKey>athp2_xyz(1)</ParameterKey>
  80 + <ParameterKey>athp2_xyz_gse(1)</ParameterKey>
81 81 </Element>
82 82 <Element>
83 83 <Name>z</Name>
84 84 <Index>3</Index>
85   - <ParameterKey>athp2_xyz(2)</ParameterKey>
  85 + <ParameterKey>athp2_xyz_gse(2)</ParameterKey>
86 86 </Element>
87 87 </Structure>
88 88 <Support>
... ...
NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
... ... @@ -113,7 +113,7 @@
113 113 <Element>
114 114 <Name>x</Name>
115 115 <Index>1</Index>
116   - <ParameterKey>amal_sat_jso(0)</ParameterKey>
  116 + <ParameterKey>amal_jup_jso(0)</ParameterKey>
117 117 </Element>
118 118 <Element>
119 119 <Name>y</Name>
... ...
NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
... ... @@ -124,7 +124,7 @@ The radiation level at Callisto&#39;s surface is equivalent to a dose of about 0.01
124 124 <Element>
125 125 <Name>x</Name>
126 126 <Index>1</Index>
127   - <ParameterKey>cal_sat_jso(0)</ParameterKey>
  127 + <ParameterKey>cal_jup_jso(0)</ParameterKey>
128 128 </Element>
129 129 <Element>
130 130 <Name>y</Name>
... ...
NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
... ... @@ -131,7 +131,7 @@ orbital resonance.&lt;/Description&gt;
131 131 <Element>
132 132 <Name>x</Name>
133 133 <Index>1</Index>
134   - <ParameterKey>eur_sat_jso(0)</ParameterKey>
  134 + <ParameterKey>eur_jup_jso(0)</ParameterKey>
135 135 </Element>
136 136 <Element>
137 137 <Name>y</Name>
... ...
NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
... ... @@ -121,7 +121,7 @@ resonance. &lt;/Description&gt;
121 121 <Element>
122 122 <Name>x</Name>
123 123 <Index>1</Index>
124   - <ParameterKey>gan_sat_jso(0)</ParameterKey>
  124 + <ParameterKey>gan_jup_jso(0)</ParameterKey>
125 125 </Element>
126 126 <Element>
127 127 <Name>y</Name>
... ...
NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
... ... @@ -117,7 +117,7 @@ as the trailing hemisphere.&lt;/Description&gt;
117 117 <Element>
118 118 <Name>x</Name>
119 119 <Index>1</Index>
120   - <ParameterKey>io_sat_jso(0)</ParameterKey>
  120 + <ParameterKey>io_jup_jso(0)</ParameterKey>
121 121 </Element>
122 122 <Element>
123 123 <Name>y</Name>
... ...
NumericalData/CDPP-AMDA/Ephemerides/mars-deimos-orb.xml
... ... @@ -73,17 +73,17 @@
73 73 <Element>
74 74 <Name>deimos_x</Name>
75 75 <Index>1</Index>
76   - <ParameterKey>deimos_xyz_mso(0)</ParameterKey>
  76 + <ParameterKey>xyz_deimos(0)</ParameterKey>
77 77 </Element>
78 78 <Element>
79 79 <Name>deimos_y</Name>
80 80 <Index>2</Index>
81   - <ParameterKey>deimos_xyz_mso(1)</ParameterKey>
  81 + <ParameterKey>xyz_deimos(1)</ParameterKey>
82 82 </Element>
83 83 <Element>
84 84 <Name>deimos_z</Name>
85 85 <Index>3</Index>
86   - <ParameterKey>deimos_xyz_mso(2)</ParameterKey>
  86 + <ParameterKey>xyz_deimos(2)</ParameterKey>
87 87 </Element>
88 88 </Structure>
89 89 <Support>
... ...
NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
... ... @@ -80,7 +80,7 @@
80 80 <Element>
81 81 <Name>x_ephio</Name>
82 82 <Index>1</Index>
83   - <ParameterKey>gll_orb_euxyziphio(0)</ParameterKey>
  83 + <ParameterKey>gll_orb_euxyzephio(0)</ParameterKey>
84 84 </Element>
85 85 <Element>
86 86 <Name>y_ephio</Name>
... ...
NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
... ... @@ -150,17 +150,17 @@
150 150 <Element>
151 151 <Name>x</Name>
152 152 <Index>1</Index>
153   - <ParameterKey>juice_jucr30_js0(0)</ParameterKey>
  153 + <ParameterKey>juice_jucr30_jso(0)</ParameterKey>
154 154 </Element>
155 155 <Element>
156 156 <Name>y</Name>
157 157 <Index>2</Index>
158   - <ParameterKey>juice_jucr30_js0(1)</ParameterKey>
  158 + <ParameterKey>juice_jucr30_jso(1)</ParameterKey>
159 159 </Element>
160 160 <Element>
161 161 <Name>z</Name>
162 162 <Index>3</Index>
163   - <ParameterKey>juice_jucr30_js0(2)</ParameterKey>
  163 + <ParameterKey>juice_jucr30_jso(2)</ParameterKey>
164 164 </Element>
165 165 </Structure>
166 166 <Support>
... ...
NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
... ... @@ -148,17 +148,17 @@
148 148 <Element>
149 149 <Name>x</Name>
150 150 <Index>1</Index>
151   - <ParameterKey>juice_jucr32_js0(0)</ParameterKey>
  151 + <ParameterKey>juice_jucr32_jso(0)</ParameterKey>
152 152 </Element>
153 153 <Element>
154 154 <Name>y</Name>
155 155 <Index>2</Index>
156   - <ParameterKey>juice_jucr32_js0(1)</ParameterKey>
  156 + <ParameterKey>juice_jucr32_jso(1)</ParameterKey>
157 157 </Element>
158 158 <Element>
159 159 <Name>z</Name>
160 160 <Index>3</Index>
161   - <ParameterKey>juice_jucr32_js0(2)</ParameterKey>
  161 + <ParameterKey>juice_jucr32_jso(2)</ParameterKey>
162 162 </Element>
163 163 </Structure>
164 164 <Support>
... ...
NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
... ... @@ -148,17 +148,17 @@
148 148 <Element>
149 149 <Name>x</Name>
150 150 <Index>1</Index>
151   - <ParameterKey>juice_jucr41_js0(0)</ParameterKey>
  151 + <ParameterKey>juice_jucr41_jso(0)</ParameterKey>
152 152 </Element>
153 153 <Element>
154 154 <Name>y</Name>
155 155 <Index>2</Index>
156   - <ParameterKey>juice_jucr41_js0(1)</ParameterKey>
  156 + <ParameterKey>juice_jucr41_jso(1)</ParameterKey>
157 157 </Element>
158 158 <Element>
159 159 <Name>z</Name>
160 160 <Index>3</Index>
161   - <ParameterKey>juice_jucr41_js0(2)</ParameterKey>
  161 + <ParameterKey>juice_jucr41_jso(2)</ParameterKey>
162 162 </Element>
163 163 </Structure>
164 164 <Support>
... ...
NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs1s.xml
... ... @@ -119,7 +119,7 @@
119 119 <Element>
120 120 <Name>y</Name>
121 121 <Index>2</Index>
122   - <ParameterKey>mav_xyz_mso(11s)</ParameterKey>
  122 + <ParameterKey>mav_xyz_mso1s(1)</ParameterKey>
123 123 </Element>
124 124 <Element>
125 125 <Name>z</Name>
... ...
NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-Hmom.xml
... ... @@ -273,7 +273,7 @@
273 273 <Name>vz</Name>
274 274 <Qualifier>Component.K</Qualifier>
275 275 <Index>3</Index>
276   - <ParameterKey>psp_spc_Hv_inst(2)</ParameterKey>
  276 + <ParameterKey>psp_spi_Hv_inst(2)</ParameterKey>
277 277 </Element>
278 278 </Structure>
279 279 <Particle>
... ...
NumericalData/CDPP-AMDA/PSP/SPI/psp-spi-amom.xml
... ... @@ -283,7 +283,7 @@
283 283 <Name>vz</Name>
284 284 <Qualifier>Component.K</Qualifier>
285 285 <Index>3</Index>
286   - <ParameterKey>psp_spc_av_inst(2)</ParameterKey>
  286 + <ParameterKey>psp_spi_av_inst(2)</ParameterKey>
287 287 </Element>
288 288 </Structure>
289 289 <Particle>
... ...
NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
... ... @@ -150,7 +150,7 @@
150 150 <Name>bz</Name>
151 151 <Qualifier>Component.K</Qualifier>
152 152 <Index>3</Index>
153   - <ParameterKey>solo_b_sr_8s(2)</ParameterKey>
  153 + <ParameterKey>solo_b_srf_8s(2)</ParameterKey>
154 154 </Element>
155 155 </Structure>
156 156 <Field>
... ...
NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
... ... @@ -85,7 +85,7 @@
85 85 <Element>
86 86 <Name>bn</Name>
87 87 <Index>3</Index>
88   - <ParameterKey>vo2_b_uratn(2)</ParameterKey>
  88 + <ParameterKey>vo2_b_urartn(2)</ParameterKey>
89 89 </Element>
90 90 </Structure>
91 91 <Field>
... ...