Commit a4869284e43780f13c6164cb1a96d1f9b80e4611
1 parent
36450a02
Exists in
cleanup_registry_merged
and in
2 other branches
Update Galileo with wsd 2.4.0
Showing
6 changed files
with
109 additions
and
2 deletions
Show diff stats
NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-khurana.xml
@@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
33 | </AccessInformation> | 33 | </AccessInformation> |
34 | <ProviderName/> | 34 | <ProviderName/> |
35 | <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Galileo/Models</InstrumentID> | 35 | <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Galileo/Models</InstrumentID> |
36 | - <MeasurementType/> | 36 | + <MeasurementType>MagneticField</MeasurementType> |
37 | <TemporalDescription> | 37 | <TemporalDescription> |
38 | <TimeSpan> | 38 | <TimeSpan> |
39 | <StartDate>1996-05-29T00:00:00Z</StartDate> | 39 | <StartDate>1996-05-29T00:00:00Z</StartDate> |
@@ -78,6 +78,10 @@ | @@ -78,6 +78,10 @@ | ||
78 | <FillValue/> | 78 | <FillValue/> |
79 | </Element> | 79 | </Element> |
80 | </Structure> | 80 | </Structure> |
81 | + <Field> | ||
82 | + <Qualifier>Vector</Qualifier> | ||
83 | + <FieldQuantity>Magnetic</FieldQuantity> | ||
84 | + </Field> | ||
81 | </Parameter> | 85 | </Parameter> |
82 | <Parameter> | 86 | <Parameter> |
83 | <Name>b_mag</Name> | 87 | <Name>b_mag</Name> |
@@ -86,6 +90,10 @@ | @@ -86,6 +90,10 @@ | ||
86 | <UCD/> | 90 | <UCD/> |
87 | <Units>nT</Units> | 91 | <Units>nT</Units> |
88 | <UnitsConversion/> | 92 | <UnitsConversion/> |
93 | + <Field> | ||
94 | + <Qualifier>Vector</Qualifier> | ||
95 | + <FieldQuantity>Magnetic</FieldQuantity> | ||
96 | + </Field> | ||
89 | </Parameter> | 97 | </Parameter> |
90 | </NumericalData> | 98 | </NumericalData> |
91 | </Spase> | 99 | </Spase> |
NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-onera.xml
@@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
34 | </AccessInformation> | 34 | </AccessInformation> |
35 | <ProviderName/> | 35 | <ProviderName/> |
36 | <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Galileo/Models</InstrumentID> | 36 | <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Galileo/Models</InstrumentID> |
37 | - <MeasurementType>Model</MeasurementType> | 37 | + <MeasurementType>MagneticField</MeasurementType> |
38 | <TemporalDescription> | 38 | <TemporalDescription> |
39 | <TimeSpan> | 39 | <TimeSpan> |
40 | <StartDate>1996-05-27T00:25:50Z</StartDate> | 40 | <StartDate>1996-05-27T00:25:50Z</StartDate> |
@@ -61,6 +61,10 @@ | @@ -61,6 +61,10 @@ | ||
61 | <UCD/> | 61 | <UCD/> |
62 | <Units>nT</Units> | 62 | <Units>nT</Units> |
63 | <UnitsConversion/> | 63 | <UnitsConversion/> |
64 | + <Field> | ||
65 | + <Qualifier>Magnitude</Qualifier> | ||
66 | + <FieldQuantity>Magnetic</FieldQuantity> | ||
67 | + </Field> | ||
64 | </Parameter> | 68 | </Parameter> |
65 | <Parameter> | 69 | <Parameter> |
66 | <Name>b_eq</Name> | 70 | <Name>b_eq</Name> |
@@ -69,6 +73,10 @@ | @@ -69,6 +73,10 @@ | ||
69 | <UCD/> | 73 | <UCD/> |
70 | <Units>nT</Units> | 74 | <Units>nT</Units> |
71 | <UnitsConversion/> | 75 | <UnitsConversion/> |
76 | + <Field> | ||
77 | + <Qualifier>Magnitude</Qualifier> | ||
78 | + <FieldQuantity>Magnetic</FieldQuantity> | ||
79 | + </Field> | ||
72 | </Parameter> | 80 | </Parameter> |
73 | <Parameter> | 81 | <Parameter> |
74 | <Name>L</Name> | 82 | <Name>L</Name> |
@@ -77,6 +85,9 @@ | @@ -77,6 +85,9 @@ | ||
77 | <UCD/> | 85 | <UCD/> |
78 | <Units>Rj</Units> | 86 | <Units>Rj</Units> |
79 | <UnitsConversion/> | 87 | <UnitsConversion/> |
88 | + <Support> | ||
89 | + <SupportQuantity>Positional</SupportQuantity> | ||
90 | + </Support> | ||
80 | </Parameter> | 91 | </Parameter> |
81 | <Parameter> | 92 | <Parameter> |
82 | <Name>L*</Name> | 93 | <Name>L*</Name> |
@@ -85,6 +96,9 @@ | @@ -85,6 +96,9 @@ | ||
85 | <UCD/> | 96 | <UCD/> |
86 | <Units>Rj</Units> | 97 | <Units>Rj</Units> |
87 | <UnitsConversion/> | 98 | <UnitsConversion/> |
99 | + <Support> | ||
100 | + <SupportQuantity>Positional</SupportQuantity> | ||
101 | + </Support> | ||
88 | </Parameter> | 102 | </Parameter> |
89 | <Parameter> | 103 | <Parameter> |
90 | <Name>I</Name> | 104 | <Name>I</Name> |
@@ -93,6 +107,10 @@ | @@ -93,6 +107,10 @@ | ||
93 | <UCD/> | 107 | <UCD/> |
94 | <Units/> | 108 | <Units/> |
95 | <UnitsConversion/> | 109 | <UnitsConversion/> |
110 | + <Field> | ||
111 | + <Qualifier>Magnitude</Qualifier> | ||
112 | + <FieldQuantity>Magnetic</FieldQuantity> | ||
113 | + </Field> | ||
96 | </Parameter> | 114 | </Parameter> |
97 | <Parameter> | 115 | <Parameter> |
98 | <Name>MLT</Name> | 116 | <Name>MLT</Name> |
@@ -101,6 +119,9 @@ | @@ -101,6 +119,9 @@ | ||
101 | <UCD/> | 119 | <UCD/> |
102 | <Units>h</Units> | 120 | <Units>h</Units> |
103 | <UnitsConversion/> | 121 | <UnitsConversion/> |
122 | + <Support> | ||
123 | + <SupportQuantity>Temporal</SupportQuantity> | ||
124 | + </Support> | ||
104 | </Parameter> | 125 | </Parameter> |
105 | <Parameter> | 126 | <Parameter> |
106 | <Name>alpha</Name> | 127 | <Name>alpha</Name> |
@@ -109,6 +130,9 @@ | @@ -109,6 +130,9 @@ | ||
109 | <UCD/> | 130 | <UCD/> |
110 | <Units>deg</Units> | 131 | <Units>deg</Units> |
111 | <UnitsConversion/> | 132 | <UnitsConversion/> |
133 | + <Support> | ||
134 | + <SupportQuantity>Positional</SupportQuantity> | ||
135 | + </Support> | ||
112 | </Parameter> | 136 | </Parameter> |
113 | <Parameter><Name>alpha_eq</Name> | 137 | <Parameter><Name>alpha_eq</Name> |
114 | <ParameterKey>gll_onera_alphaeq</ParameterKey> | 138 | <ParameterKey>gll_onera_alphaeq</ParameterKey> |
@@ -116,6 +140,9 @@ | @@ -116,6 +140,9 @@ | ||
116 | <UCD/> | 140 | <UCD/> |
117 | <Units>deg</Units> | 141 | <Units>deg</Units> |
118 | <UnitsConversion/> | 142 | <UnitsConversion/> |
143 | + <Support> | ||
144 | + <SupportQuantity>Positional</SupportQuantity> | ||
145 | + </Support> | ||
119 | </Parameter> | 146 | </Parameter> |
120 | </NumericalData> | 147 | </NumericalData> |
121 | </Spase> | 148 | </Spase> |
NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/cal-eph-pol.xml
@@ -48,6 +48,9 @@ | @@ -48,6 +48,9 @@ | ||
48 | <UCD/> | 48 | <UCD/> |
49 | <Units>deg</Units> | 49 | <Units>deg</Units> |
50 | <UnitsConversion/> | 50 | <UnitsConversion/> |
51 | + <Support> | ||
52 | + <SupportQuantity>Positional</SupportQuantity> | ||
53 | + </Support> | ||
51 | </Parameter> | 54 | </Parameter> |
52 | <Parameter> | 55 | <Parameter> |
53 | <Name>lat</Name> | 56 | <Name>lat</Name> |
@@ -56,6 +59,9 @@ | @@ -56,6 +59,9 @@ | ||
56 | <UCD/> | 59 | <UCD/> |
57 | <Units>deg</Units> | 60 | <Units>deg</Units> |
58 | <UnitsConversion/> | 61 | <UnitsConversion/> |
62 | + <Support> | ||
63 | + <SupportQuantity>Positional</SupportQuantity> | ||
64 | + </Support> | ||
59 | </Parameter> | 65 | </Parameter> |
60 | <Parameter> | 66 | <Parameter> |
61 | <Name>mlat</Name> | 67 | <Name>mlat</Name> |
@@ -64,6 +70,9 @@ | @@ -64,6 +70,9 @@ | ||
64 | <UCD/> | 70 | <UCD/> |
65 | <Units>deg</Units> | 71 | <Units>deg</Units> |
66 | <UnitsConversion/> | 72 | <UnitsConversion/> |
73 | + <Support> | ||
74 | + <SupportQuantity>Positional</SupportQuantity> | ||
75 | + </Support> | ||
67 | </Parameter> | 76 | </Parameter> |
68 | <Parameter> | 77 | <Parameter> |
69 | <Name>local time</Name> | 78 | <Name>local time</Name> |
@@ -72,6 +81,9 @@ | @@ -72,6 +81,9 @@ | ||
72 | <UCD/> | 81 | <UCD/> |
73 | <Units>hours</Units> | 82 | <Units>hours</Units> |
74 | <UnitsConversion/> | 83 | <UnitsConversion/> |
84 | + <Support> | ||
85 | + <SupportQuantity>Temporal</SupportQuantity> | ||
86 | + </Support> | ||
75 | </Parameter> | 87 | </Parameter> |
76 | <Parameter> | 88 | <Parameter> |
77 | <Name>distance callisto-jupiter</Name> | 89 | <Name>distance callisto-jupiter</Name> |
@@ -80,6 +92,9 @@ | @@ -80,6 +92,9 @@ | ||
80 | <UCD/> | 92 | <UCD/> |
81 | <Units>Rj</Units> | 93 | <Units>Rj</Units> |
82 | <UnitsConversion/> | 94 | <UnitsConversion/> |
95 | + <Support> | ||
96 | + <SupportQuantity>Positional</SupportQuantity> | ||
97 | + </Support> | ||
83 | </Parameter> | 98 | </Parameter> |
84 | <Parameter> | 99 | <Parameter> |
85 | <Name>IoPhase</Name> | 100 | <Name>IoPhase</Name> |
@@ -88,6 +103,9 @@ | @@ -88,6 +103,9 @@ | ||
88 | <UCD/> | 103 | <UCD/> |
89 | <Units>deg</Units> | 104 | <Units>deg</Units> |
90 | <UnitsConversion/> | 105 | <UnitsConversion/> |
106 | + <Support> | ||
107 | + <SupportQuantity>Positional</SupportQuantity> | ||
108 | + </Support> | ||
91 | </Parameter> | 109 | </Parameter> |
92 | </NumericalData> | 110 | </NumericalData> |
93 | </Spase> | 111 | </Spase> |
NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/eur-eph-pol.xml
@@ -45,31 +45,49 @@ | @@ -45,31 +45,49 @@ | ||
45 | <Name>lon</Name> | 45 | <Name>lon</Name> |
46 | <ParameterKey>eur_pol_lon</ParameterKey> | 46 | <ParameterKey>eur_pol_lon</ParameterKey> |
47 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 47 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
48 | + <Support> | ||
49 | + <SupportQuantity>Positional</SupportQuantity> | ||
50 | + </Support> | ||
48 | </Parameter> | 51 | </Parameter> |
49 | <Parameter> | 52 | <Parameter> |
50 | <Name>lat</Name> | 53 | <Name>lat</Name> |
51 | <ParameterKey>eur_pol_lat</ParameterKey> | 54 | <ParameterKey>eur_pol_lat</ParameterKey> |
52 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 55 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
56 | + <Support> | ||
57 | + <SupportQuantity>Positional</SupportQuantity> | ||
58 | + </Support> | ||
53 | </Parameter> | 59 | </Parameter> |
54 | <Parameter> | 60 | <Parameter> |
55 | <Name>mlat</Name> | 61 | <Name>mlat</Name> |
56 | <ParameterKey>eur_pol_mlat</ParameterKey> | 62 | <ParameterKey>eur_pol_mlat</ParameterKey> |
57 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 63 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
64 | + <Support> | ||
65 | + <SupportQuantity>Positional</SupportQuantity> | ||
66 | + </Support> | ||
58 | </Parameter> | 67 | </Parameter> |
59 | <Parameter> | 68 | <Parameter> |
60 | <Name>local time</Name> | 69 | <Name>local time</Name> |
61 | <ParameterKey>eur_pol_lt</ParameterKey> | 70 | <ParameterKey>eur_pol_lt</ParameterKey> |
62 | <Description/><UCD/><Units>hours</Units><UnitsConversion/> | 71 | <Description/><UCD/><Units>hours</Units><UnitsConversion/> |
72 | + <Support> | ||
73 | + <SupportQuantity>Temporal</SupportQuantity> | ||
74 | + </Support> | ||
63 | </Parameter> | 75 | </Parameter> |
64 | <Parameter> | 76 | <Parameter> |
65 | <Name>distance europa-jupiter</Name> | 77 | <Name>distance europa-jupiter</Name> |
66 | <ParameterKey>eur_pol_r</ParameterKey> | 78 | <ParameterKey>eur_pol_r</ParameterKey> |
67 | <Description/><UCD/><Units>Rj</Units><UnitsConversion/> | 79 | <Description/><UCD/><Units>Rj</Units><UnitsConversion/> |
80 | + <Support> | ||
81 | + <SupportQuantity>Positional</SupportQuantity> | ||
82 | + </Support> | ||
68 | </Parameter> | 83 | </Parameter> |
69 | <Parameter> | 84 | <Parameter> |
70 | <Name>IoPhase</Name> | 85 | <Name>IoPhase</Name> |
71 | <ParameterKey>eur_pol_iophase</ParameterKey> | 86 | <ParameterKey>eur_pol_iophase</ParameterKey> |
72 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 87 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
88 | + <Support> | ||
89 | + <SupportQuantity>Positional</SupportQuantity> | ||
90 | + </Support> | ||
73 | </Parameter> | 91 | </Parameter> |
74 | </NumericalData> | 92 | </NumericalData> |
75 | </Spase> | 93 | </Spase> |
NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/gan-eph-pol.xml
@@ -45,31 +45,49 @@ | @@ -45,31 +45,49 @@ | ||
45 | <Name>lon</Name> | 45 | <Name>lon</Name> |
46 | <ParameterKey>gan_pol_lon</ParameterKey> | 46 | <ParameterKey>gan_pol_lon</ParameterKey> |
47 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 47 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
48 | + <Support> | ||
49 | + <SupportQuantity>Positional</SupportQuantity> | ||
50 | + </Support> | ||
48 | </Parameter> | 51 | </Parameter> |
49 | <Parameter> | 52 | <Parameter> |
50 | <Name>lat</Name> | 53 | <Name>lat</Name> |
51 | <ParameterKey>gan_pol_lat</ParameterKey> | 54 | <ParameterKey>gan_pol_lat</ParameterKey> |
52 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 55 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
56 | + <Support> | ||
57 | + <SupportQuantity>Positional</SupportQuantity> | ||
58 | + </Support> | ||
53 | </Parameter> | 59 | </Parameter> |
54 | <Parameter> | 60 | <Parameter> |
55 | <Name>mlat</Name> | 61 | <Name>mlat</Name> |
56 | <ParameterKey>gan_pol_mlat</ParameterKey> | 62 | <ParameterKey>gan_pol_mlat</ParameterKey> |
57 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 63 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
64 | + <Support> | ||
65 | + <SupportQuantity>Positional</SupportQuantity> | ||
66 | + </Support> | ||
58 | </Parameter> | 67 | </Parameter> |
59 | <Parameter> | 68 | <Parameter> |
60 | <Name>local time</Name> | 69 | <Name>local time</Name> |
61 | <ParameterKey>gan_pol_lt</ParameterKey> | 70 | <ParameterKey>gan_pol_lt</ParameterKey> |
62 | <Description/><UCD/><Units>hours</Units><UnitsConversion/> | 71 | <Description/><UCD/><Units>hours</Units><UnitsConversion/> |
72 | + <Support> | ||
73 | + <SupportQuantity>Temporal</SupportQuantity> | ||
74 | + </Support> | ||
63 | </Parameter> | 75 | </Parameter> |
64 | <Parameter> | 76 | <Parameter> |
65 | <Name>distanse ganymede-jupiter</Name> | 77 | <Name>distanse ganymede-jupiter</Name> |
66 | <ParameterKey>gan_pol_r</ParameterKey> | 78 | <ParameterKey>gan_pol_r</ParameterKey> |
67 | <Description/><UCD/><Units>Rj</Units><UnitsConversion/> | 79 | <Description/><UCD/><Units>Rj</Units><UnitsConversion/> |
80 | + <Support> | ||
81 | + <SupportQuantity>Positional</SupportQuantity> | ||
82 | + </Support> | ||
68 | </Parameter> | 83 | </Parameter> |
69 | <Parameter> | 84 | <Parameter> |
70 | <Name>IoPhase</Name> | 85 | <Name>IoPhase</Name> |
71 | <ParameterKey>gan_pol_iophase</ParameterKey> | 86 | <ParameterKey>gan_pol_iophase</ParameterKey> |
72 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 87 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
88 | + <Support> | ||
89 | + <SupportQuantity>Positional</SupportQuantity> | ||
90 | + </Support> | ||
73 | </Parameter> | 91 | </Parameter> |
74 | </NumericalData> | 92 | </NumericalData> |
75 | </Spase> | 93 | </Spase> |
NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/io-eph-pol.xml
@@ -45,31 +45,49 @@ | @@ -45,31 +45,49 @@ | ||
45 | <Name>lon</Name> | 45 | <Name>lon</Name> |
46 | <ParameterKey>io_pol_lon</ParameterKey> | 46 | <ParameterKey>io_pol_lon</ParameterKey> |
47 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 47 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
48 | + <Support> | ||
49 | + <SupportQuantity>Positional</SupportQuantity> | ||
50 | + </Support> | ||
48 | </Parameter> | 51 | </Parameter> |
49 | <Parameter> | 52 | <Parameter> |
50 | <Name>lat</Name> | 53 | <Name>lat</Name> |
51 | <ParameterKey>io_pol_lat</ParameterKey> | 54 | <ParameterKey>io_pol_lat</ParameterKey> |
52 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 55 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
56 | + <Support> | ||
57 | + <SupportQuantity>Positional</SupportQuantity> | ||
58 | + </Support> | ||
53 | </Parameter> | 59 | </Parameter> |
54 | <Parameter> | 60 | <Parameter> |
55 | <Name>mlat</Name> | 61 | <Name>mlat</Name> |
56 | <ParameterKey>io_pol_mlat</ParameterKey> | 62 | <ParameterKey>io_pol_mlat</ParameterKey> |
57 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 63 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
64 | + <Support> | ||
65 | + <SupportQuantity>Positional</SupportQuantity> | ||
66 | + </Support> | ||
58 | </Parameter> | 67 | </Parameter> |
59 | <Parameter> | 68 | <Parameter> |
60 | <Name>local time</Name> | 69 | <Name>local time</Name> |
61 | <ParameterKey>io_pol_lt</ParameterKey> | 70 | <ParameterKey>io_pol_lt</ParameterKey> |
62 | <Description/><UCD/><Units>hours</Units><UnitsConversion/> | 71 | <Description/><UCD/><Units>hours</Units><UnitsConversion/> |
72 | + <Support> | ||
73 | + <SupportQuantity>Temporal</SupportQuantity> | ||
74 | + </Support> | ||
63 | </Parameter> | 75 | </Parameter> |
64 | <Parameter> | 76 | <Parameter> |
65 | <Name>distance io-jupiter</Name> | 77 | <Name>distance io-jupiter</Name> |
66 | <ParameterKey>io_pol_r</ParameterKey> | 78 | <ParameterKey>io_pol_r</ParameterKey> |
67 | <Description/><UCD/><Units>Rj</Units><UnitsConversion/> | 79 | <Description/><UCD/><Units>Rj</Units><UnitsConversion/> |
80 | + <Support> | ||
81 | + <SupportQuantity>Positional</SupportQuantity> | ||
82 | + </Support> | ||
68 | </Parameter> | 83 | </Parameter> |
69 | <Parameter> | 84 | <Parameter> |
70 | <Name>IoPhase</Name> | 85 | <Name>IoPhase</Name> |
71 | <ParameterKey>io_pol_iophase</ParameterKey> | 86 | <ParameterKey>io_pol_iophase</ParameterKey> |
72 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> | 87 | <Description/><UCD/><Units>deg</Units><UnitsConversion/> |
88 | + <Support> | ||
89 | + <SupportQuantity>Positional</SupportQuantity> | ||
90 | + </Support> | ||
73 | </Parameter> | 91 | </Parameter> |
74 | </NumericalData> | 92 | </NumericalData> |
75 | </Spase> | 93 | </Spase> |