CDPP / CNES

Commit 25590ef99652219c87dee1c921a8a7d69db05b97

Authored by Quentin Brzustowski
2 parents a78cdbe3 714519da
Exists in master and in 11 other branches amdadev, aschulz, autocommit, bepi_master, bepi_update, cleanup_registry, cleanup_registry_master, cleanup_registry_merged, juice_jdc, juno_jade, soar

Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/CNES

Showing 2 changed files with 138 additions and 61 deletions   Show diff stats
Inline Side-by-side
NumericalData/CDPP-AMDA/Ephemerides/earth-orb-all.xml
  Diff comments   View file @25590ef
... ... @@ -39,6 +39,40 @@ Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the nor
39 39 </TemporalDescription>
40 40 <ObservedRegion>Earth</ObservedRegion>
41 41 <Parameter>
  42 + <Name>xyz_hee</Name>
  43 + <ParameterKey>xyz_earth_hee</ParameterKey>
  44 + <Ucd/>
  45 + <Units>AU</Units>
  46 + <CoordinateSystem>
  47 + <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
  48 + <CoordinateSystemName>HEE</CoordinateSystemName>
  49 + </CoordinateSystem>
  50 + <RenderingHints>
  51 + <DisplayType>TimeSeries</DisplayType>
  52 + </RenderingHints>
  53 + <Structure>
  54 + <Size>3</Size>
  55 + <Element>
  56 + <Name>x</Name>
  57 + <Index>1</Index>
  58 + <ParameterKey>xyz_earth_hee(0)</ParameterKey>
  59 + </Element>
  60 + <Element>
  61 + <Name>y</Name>
  62 + <Index>2</Index>
  63 + <ParameterKey>xyz_earth_hee(1)</ParameterKey>
  64 + </Element>
  65 + <Element>
  66 + <Name>z</Name>
  67 + <Index>3</Index>
  68 + <ParameterKey>xyz_earth_hee(2)</ParameterKey>
  69 + </Element>
  70 + </Structure>
  71 + <Support>
  72 + <SupportQuantity>Positional</SupportQuantity>
  73 + </Support>
  74 + </Parameter>
  75 + <Parameter>
42 76 <Name>xyz_hci</Name>
43 77 <ParameterKey>xyz_earth_hci</ParameterKey>
44 78 <Ucd/>
... ...
NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
  Diff comments   View file @25590ef
... ... @@ -32,7 +32,7 @@
32 32 </Acknowledgement>
33 33 </AccessInformation>
34 34 <ProviderName>ESA</ProviderName>
35   - <ProviderResourceName>solo_ANC_soc-orbit_20200210-20301118_L000_V0_00001_V01.bsp</ProviderResourceName>
  35 + <ProviderResourceName>solo_ANC_soc-orbit_20200210-20301118_L002_V1_00014_V01.bsp</ProviderResourceName>
36 36 <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/Ephemeris</InstrumentID>
37 37 <MeasurementType>Ephemeris</MeasurementType>
38 38 <TemporalDescription>
... ... @@ -44,66 +44,7 @@
44 44 </TemporalDescription>
45 45 <ObservedRegion>Heliosphere.Inner</ObservedRegion>
46 46 <Caveats>
47   - </Caveats>
48   - <Parameter>
49   - <Name>xyz_iau_sun</Name>
50   - <ParameterKey>so_all_xyz</ParameterKey>
51   - <Description/>
52   - <Ucd/>
53   - <Units>AU</Units>
54   - <UnitsConversion/>
55   - <Structure>
56   - <Size>3</Size>
57   - <Element>
58   - <Name>x</Name>
59   - <Index>1</Index>
60   - <ParameterKey>so_all_xyz(0)</ParameterKey>
61   - <ValidMin/>
62   - <ValidMax/>
63   - <FillValue/>
64   - </Element>
65   - <Element>
66   - <Name>y</Name>
67   - <Index>2</Index>
68   - <ParameterKey>so_all_xyz(1)</ParameterKey>
69   - <ValidMin/>
70   - <ValidMax/>
71   - <FillValue/>
72   - </Element>
73   - <Element>
74   - <Name>z</Name>
75   - <Index>3</Index>
76   - <ParameterKey>so_all_xyz(2)</ParameterKey>
77   - <ValidMin/>
78   - <ValidMax/>
79   - <FillValue/>
80   - </Element>
81   - </Structure>
82   - </Parameter>
83   - <Parameter>
84   - <Name>distance solo-sun</Name>
85   - <ParameterKey>so_all_r</ParameterKey>
86   - <Description/>
87   - <Ucd/>
88   - <Units>AU</Units>
89   - <UnitsConversion/>
90   - </Parameter>
91   - <Parameter>
92   - <Name>lon iau_sun</Name>
93   - <ParameterKey>so_all_lon</ParameterKey>
94   - <Description/>
95   - <Ucd/>
96   - <Units>deg</Units>
97   - <UnitsConversion/>
98   - </Parameter>
99   - <Parameter>
100   - <Name>lat iau_sun</Name>
101   - <ParameterKey>so_all_lat</ParameterKey>
102   - <Description/>
103   - <Ucd/>
104   - <Units>deg</Units>
105   - <UnitsConversion/>
106   - </Parameter>
  47 + </Caveats>
107 48 <Parameter>
108 49 <Name>xyz_hee</Name>
109 50 <ParameterKey>so_all_hee</ParameterKey>
... ... @@ -173,5 +114,107 @@
173 114 </Element>
174 115 </Structure>
175 116 </Parameter>
  117 + <Parameter>
  118 + <Name>xyz_hci</Name>
  119 + <ParameterKey>so_all_hci</ParameterKey>
  120 + <Description/>
  121 + <Ucd/>
  122 + <Units>AU</Units>
  123 + <UnitsConversion/>
  124 + <Structure>
  125 + <Size>3</Size>
  126 + <Element>
  127 + <Name>x</Name>
  128 + <Index>1</Index>
  129 + <ParameterKey>so_all_hci(0)</ParameterKey>
  130 + <ValidMin/>
  131 + <ValidMax/>
  132 + <FillValue/>
  133 + </Element>
  134 + <Element>
  135 + <Name>y</Name>
  136 + <Index>2</Index>
  137 + <ParameterKey>so_all_hci(1)</ParameterKey>
  138 + <ValidMin/>
  139 + <ValidMax/>
  140 + <FillValue/>
  141 + </Element>
  142 + <Element>
  143 + <Name>z</Name>
  144 + <Index>3</Index>
  145 + <ParameterKey>so_all_hci(2)</ParameterKey>
  146 + <ValidMin/>
  147 + <ValidMax/>
  148 + <FillValue/>
  149 + </Element>
  150 + </Structure>
  151 + </Parameter>
  152 + <Parameter>
  153 + <Name>xyz_iau_sun</Name>
  154 + <ParameterKey>so_all_xyz</ParameterKey>
  155 + <Description/>
  156 + <Ucd/>
  157 + <Units>AU</Units>
  158 + <UnitsConversion/>
  159 + <Structure>
  160 + <Size>3</Size>
  161 + <Element>
  162 + <Name>x</Name>
  163 + <Index>1</Index>
  164 + <ParameterKey>so_all_xyz(0)</ParameterKey>
  165 + <ValidMin/>
  166 + <ValidMax/>
  167 + <FillValue/>
  168 + </Element>
  169 + <Element>
  170 + <Name>y</Name>
  171 + <Index>2</Index>
  172 + <ParameterKey>so_all_xyz(1)</ParameterKey>
  173 + <ValidMin/>
  174 + <ValidMax/>
  175 + <FillValue/>
  176 + </Element>
  177 + <Element>
  178 + <Name>z</Name>
  179 + <Index>3</Index>
  180 + <ParameterKey>so_all_xyz(2)</ParameterKey>
  181 + <ValidMin/>
  182 + <ValidMax/>
  183 + <FillValue/>
  184 + </Element>
  185 + </Structure>
  186 + </Parameter>
  187 + <Parameter>
  188 + <Name>distance solo-sun</Name>
  189 + <ParameterKey>so_all_r</ParameterKey>
  190 + <Description/>
  191 + <Ucd/>
  192 + <Units>AU</Units>
  193 + <UnitsConversion/>
  194 + </Parameter>
  195 + <Parameter>
  196 + <Name>lat iau_sun</Name>
  197 + <ParameterKey>so_all_lat</ParameterKey>
  198 + <Description/>
  199 + <Ucd/>
  200 + <Units>deg</Units>
  201 + <UnitsConversion/>
  202 + </Parameter>
  203 + <Parameter>
  204 + <Name>lon iau_sun</Name>
  205 + <ParameterKey>so_all_lon</ParameterKey>
  206 + <Description/>
  207 + <Ucd/>
  208 + <Units>deg</Units>
  209 + <UnitsConversion/>
  210 + </Parameter>
  211 + <Parameter>
  212 + <Name>lon hci</Name>
  213 + <ParameterKey>so_hci_lon</ParameterKey>
  214 + <Description/>
  215 + <Ucd/>
  216 + <Units>deg</Units>
  217 + <UnitsConversion/>
  218 + </Parameter>
176 219 </NumericalData>
177 220 </Spase>
... ...