CDPP / CNES

Commit a3893d0d7a1d7c4b55658798df6f1685a948e198

Authored by Benjamin Renard
1 parent 5855da50
Exists in master

Fix some UCDs

Showing 43 changed files with 82 additions and 82 deletions   Show diff stats
Inline Side-by-side
NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml
  Diff comments   View file @a3893d0
... ... @@ -77,7 +77,7 @@
77 77 <Name>elec countrate @@ANODE@@</Name>
78 78 <ParameterKey>cass_caps_els</ParameterKey>
79 79 <Description>energy spectrogram of electron count rates</Description>
80   - <UCD>phys.count;phys.electron;arith.rate</UCD>
  80 + <UCD>phys.flux;phys.electron;arith.rate</UCD>
81 81 <Units>cnts.s^-1</Units>
82 82 <RenderingHints>
83 83 <DisplayType>Spectrogram</DisplayType>
... ... @@ -94,7 +94,7 @@
94 94 <Name>elec countrate : sum over anodes</Name>
95 95 <ParameterKey>cass_caps_els_sum</ParameterKey>
96 96 <Description>energy spectrogram of electron count rates</Description>
97   - <UCD>phys.count;phys.electron;arith.rate</UCD>
  97 + <UCD>phys.flux;phys.electron;arith.rate</UCD>
98 98 <Units>cnts.s^-1</Units>
99 99 <RenderingHints>
100 100 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml
  Diff comments   View file @a3893d0
... ... @@ -77,7 +77,7 @@
77 77 <Name>ion countrate @@ANODE@@</Name>
78 78 <ParameterKey>cass_caps_sng</ParameterKey>
79 79 <Description>energy spectrogram of ion count rates</Description>
80   - <UCD>phys.count;phys.atmol.ionStage;arith.rate</UCD>
  80 + <UCD>phys.flux;phys.atmol.ionStage;arith.rate</UCD>
81 81 <Units>cnts.s^-1</Units>
82 82 <RenderingHints>
83 83 <DisplayType>Spectrogram</DisplayType>
... ... @@ -94,7 +94,7 @@
94 94 <Name>ion countrate : sum over anodes</Name>
95 95 <ParameterKey>cass_caps_sng_sum</ParameterKey>
96 96 <Description>energy spectrogram of ion count rates</Description>
97   - <UCD>phys.count;phys.atmol.ionStage;arith.rate</UCD>
  97 + <UCD>phys.flux;phys.atmol.ionStage;arith.rate</UCD>
98 98 <Units>cnts.s^-1</Units>
99 99 <RenderingHints>
100 100 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster1/RAPID/clust1-rap-elsp.xml
  Diff comments   View file @a3893d0
... ... @@ -86,7 +86,7 @@
86 86 <Name>diff flux</Name>
87 87 <ParameterKey>c1_rap_e</ParameterKey>
88 88 <Description>Cluster II Rumba Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
89   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  89 + <UCD>phys.flux;phys.electron</UCD>
90 90 <Cadence>PT4S</Cadence>
91 91 <Units>1/cm^2_sr_s_keV</Units>
92 92 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster1/RAPID/clust1-rap-psp.xml
  Diff comments   View file @a3893d0
... ... @@ -86,7 +86,7 @@
86 86 <Name>diff flux</Name>
87 87 <ParameterKey>c1_rap_p</ParameterKey>
88 88 <Description>Cluster II Rumba Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
89   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  89 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
90 90 <Cadence>PT4S</Cadence>
91 91 <Units>1/cm^2_sr_s_keV</Units>
92 92 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster2/RAPID/clust2-rap-elsp.xml
  Diff comments   View file @a3893d0
... ... @@ -86,7 +86,7 @@
86 86 <Name>diff flux</Name>
87 87 <ParameterKey>c2_rap_e</ParameterKey>
88 88 <Description>Cluster II Salsa Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
89   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  89 + <UCD>phys.flux;phys.electron</UCD>
90 90 <Cadence>PT4S</Cadence>
91 91 <Units>1/cm^2_sr_s_keV</Units>
92 92 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster2/RAPID/clust2-rap-psp.xml
  Diff comments   View file @a3893d0
... ... @@ -86,7 +86,7 @@
86 86 <Name>diff flux</Name>
87 87 <ParameterKey>c2_rap_p</ParameterKey>
88 88 <Description>Cluster II Salsa Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
89   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  89 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
90 90 <Cadence>PT4S</Cadence>
91 91 <Units>1/cm^2_sr_s_keV</Units>
92 92 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster3/RAPID/clust3-rap-elsp.xml
  Diff comments   View file @a3893d0
... ... @@ -91,7 +91,7 @@
91 91 <Name>diff flux</Name>
92 92 <ParameterKey>c3_rap_e</ParameterKey>
93 93 <Description>Cluster II Samba Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
94   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  94 + <UCD>phys.flux;phys.electron</UCD>
95 95 <Cadence>PT4S</Cadence>
96 96 <Units>1/cm^2_sr_s_keV</Units>
97 97 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster3/RAPID/clust3-rap-psp.xml
  Diff comments   View file @a3893d0
... ... @@ -91,7 +91,7 @@
91 91 <Name>Proton Flux </Name>
92 92 <ParameterKey>c3_rap_p</ParameterKey>
93 93 <Description>Cluster II Samba Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
94   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  94 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
95 95 <Cadence>PT4S</Cadence>
96 96 <Units>1/cm^2_sr_s_keV</Units>
97 97 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster4/RAPID/clust4-rap-elsp.xml
  Diff comments   View file @a3893d0
... ... @@ -91,7 +91,7 @@
91 91 <Name>diff flux</Name>
92 92 <ParameterKey>c4_rap_e</ParameterKey>
93 93 <Description>Cluster II Tango Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
94   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  94 + <UCD>phys.flux;phys.electron</UCD>
95 95 <Cadence>PT4S</Cadence>
96 96 <Units>1/cm^2_sr_s_keV</Units>
97 97 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Cluster/Cluster4/RAPID/clust4-rap-psp.xml
  Diff comments   View file @a3893d0
... ... @@ -91,7 +91,7 @@
91 91 <Name>diff flux</Name>
92 92 <ParameterKey>c4_rap_p</ParameterKey>
93 93 <Description>Cluster II Tango Prime Parameter Research with Adaptive Particle Imaging Detectors electron flux at spin time resolution</Description>
94   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  94 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
95 95 <Cadence>PT4S</Cadence>
96 96 <Units>1/cm^2_sr_s_keV</Units>
97 97 <RenderingHints>
... ...
NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-burstion.xml
  Diff comments   View file @a3893d0
... ... @@ -92,7 +92,7 @@
92 92 <Name>ions</Name>
93 93 <ParameterKey>gll_pls_bursticount</ParameterKey>
94 94 <Description>Spin averaged energy-time spectrogram of ion counts</Description>
95   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  95 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
96 96 <Units>cnts</Units>
97 97 <RenderingHints>
98 98 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-caion.xml
  Diff comments   View file @a3893d0
... ... @@ -75,7 +75,7 @@
75 75 <Name>ions</Name>
76 76 <ParameterKey>gll_pls_caicount</ParameterKey>
77 77 <Description>Spin averaged energy-time spectrogram of ion counts</Description>
78   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  78 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
79 79 <Units>cnts</Units>
80 80 <RenderingHints>
81 81 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-euion.xml
  Diff comments   View file @a3893d0
... ... @@ -75,7 +75,7 @@
75 75 <Parameter>
76 76 <Name>ions</Name>
77 77 <ParameterKey>gll_pls_euicount</ParameterKey>
78   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  78 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
79 79 <Units>cnts</Units>
80 80 <RenderingHints>
81 81 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-gaion.xml
  Diff comments   View file @a3893d0
... ... @@ -74,7 +74,7 @@
74 74 <Parameter>
75 75 <Name>ions</Name>
76 76 <ParameterKey>gll_pls_gaicount</ParameterKey>
77   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  77 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
78 78 <Units>cnts</Units>
79 79 <RenderingHints>
80 80 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-ioion.xml
  Diff comments   View file @a3893d0
... ... @@ -70,7 +70,7 @@
70 70 <Parameter>
71 71 <Name>ions</Name>
72 72 <ParameterKey>gll_pls_ioicount</ParameterKey>
73   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  73 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
74 74 <Units>cnts</Units>
75 75 <RenderingHints>
76 76 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-real.xml
  Diff comments   View file @a3893d0
... ... @@ -66,7 +66,7 @@
66 66 <Name>ions p2</Name>
67 67 <ParameterKey>gll_pls_realp2</ParameterKey>
68 68 <Description>energy-time spectrogram of ion counts for the P2 detector</Description>
69   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  69 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
70 70 <Units>cnts</Units>
71 71 <RenderingHints>
72 72 <DisplayType>Spectrogram</DisplayType>
... ... @@ -80,7 +80,7 @@
80 80 <Name>ions p4</Name>
81 81 <ParameterKey>gll_pls_realp4</ParameterKey>
82 82 <Description>energy-time spectrogram of ion counts for the P4 detector</Description>
83   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  83 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
84 84 <Units>cnts</Units>
85 85 <RenderingHints>
86 86 <DisplayType>Spectrogram</DisplayType>
... ... @@ -94,7 +94,7 @@
94 94 <Name>ions p6</Name>
95 95 <ParameterKey>gll_pls_realp6</ParameterKey>
96 96 <Description>energy-time spectrogram of ion counts for the P6 detector</Description>
97   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  97 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
98 98 <Units>cnts</Units>
99 99 <RenderingHints>
100 100 <DisplayType>Spectrogram</DisplayType>
... ... @@ -108,7 +108,7 @@
108 108 <Name>electrons e4</Name>
109 109 <ParameterKey>gll_pls_reale4</ParameterKey>
110 110 <Description>energy-time spectrogram of ion counts for the E4 detector</Description>
111   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  111 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
112 112 <Units>cnts</Units>
113 113 <RenderingHints>
114 114 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/MESSENGER/FIPS/mes-fips-scan.xml
  Diff comments   View file @a3893d0
... ... @@ -58,7 +58,7 @@
58 58 <Parameter>
59 59 <Name>proton_flux</Name>
60 60 <ParameterKey>mes_fips_scanprot</ParameterKey>
61   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  61 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
62 62 <Units>(keV/e)^-1 s^-1 cm^-2 sr^-1</Units>
63 63 <RenderingHints>
64 64 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-ntp.xml
  Diff comments   View file @a3893d0
... ... @@ -89,7 +89,7 @@ In this version of the dataset, many of these products are provided
89 89 <Parameter>
90 90 <Name>density h+</Name>
91 91 <ParameterKey>mes_fips_n</ParameterKey>
92   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  92 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
93 93 <Units>cm**-3</Units>
94 94 <Particle>
95 95 <ParticleType>Proton</ParticleType>
... ...
NumericalData/CDPP-AMDA/MEX/ELS/mex-els-all.xml
  Diff comments   View file @a3893d0
... ... @@ -67,7 +67,7 @@ Institute of Space Physics, PI, and the European Space Agency&lt;/Acknowledgement&gt;
67 67 <Name>counts : per anode ##anode##</Name>
68 68 <ParameterKey>mex_els_spec</ParameterKey>
69 69 <Description>energy spectrogram of electron counts</Description>
70   - <UCD>phys.count;phys.electron</UCD>
  70 + <UCD>phys.flux;phys.electron</UCD>
71 71 <Units>cnts</Units>
72 72 <RenderingHints>
73 73 <DisplayType>Spectrogram</DisplayType>
... ... @@ -84,7 +84,7 @@ Institute of Space Physics, PI, and the European Space Agency&lt;/Acknowledgement&gt;
84 84 <Name>counts : sum over anodes</Name>
85 85 <ParameterKey>mex_els_spec_sum</ParameterKey>
86 86 <Description>energy spectrogram of electron counts</Description>
87   - <UCD>phys.count;phys.electron</UCD>
  87 + <UCD>phys.flux;phys.electron</UCD>
88 88 <Units>cnts</Units>
89 89 <RenderingHints>
90 90 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-extra.xml
  Diff comments   View file @a3893d0
... ... @@ -66,7 +66,7 @@
66 66 <Name>protons : cnts per anode ##anode##</Name>
67 67 <ParameterKey>mex_h_spec</ParameterKey>
68 68 <Description>energy-time spectrogram of proton counts</Description>
69   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  69 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
70 70 <Units>cnts</Units>
71 71 <RenderingHints>
72 72 <DisplayType>Spectrogram</DisplayType>
... ... @@ -80,7 +80,7 @@
80 80 <Name>protons : cnts sum</Name>
81 81 <ParameterKey>mex_h_spec_sum</ParameterKey>
82 82 <Description>energy-time spectrogram of proton counts</Description>
83   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  83 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
84 84 <Units>cnts</Units>
85 85 <RenderingHints>
86 86 <DisplayType>Spectrogram</DisplayType>
... ... @@ -94,7 +94,7 @@
94 94 <Name>protons : fluxes per anode ##anode##</Name>
95 95 <ParameterKey>mex_h_flux</ParameterKey>
96 96 <Description>energy-time spectrogram of proton diff fluxes</Description>
97   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  97 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
98 98 <Units>cnts/(cm^2 s sr eV)</Units>
99 99 <RenderingHints>
100 100 <DisplayType>Spectrogram</DisplayType>
... ... @@ -108,7 +108,7 @@
108 108 <Name>heavy : cnts per anode ##anode##</Name>
109 109 <ParameterKey>mex_o_spec</ParameterKey>
110 110 <Description>energy-time spectrogram of heavy ion counts</Description>
111   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  111 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
112 112 <Units>cnts</Units>
113 113 <RenderingHints>
114 114 <DisplayType>Spectrogram</DisplayType>
... ... @@ -122,7 +122,7 @@
122 122 <Name>heavy : cnts sum</Name>
123 123 <ParameterKey>mex_o_spec_sum</ParameterKey>
124 124 <Description>energy-time spectrogram of heavy ion counts</Description>
125   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  125 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
126 126 <Units>cnts</Units>
127 127 <RenderingHints>
128 128 <DisplayType>Spectrogram</DisplayType>
... ... @@ -136,7 +136,7 @@
136 136 <Name>heavy : fluxes per anode ##anode##</Name>
137 137 <ParameterKey>mex_o_flux</ParameterKey>
138 138 <Description>energy-time spectrogram of heavy ion diff fluxes</Description>
139   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  139 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
140 140 <Units>cnts/(cm^2 s sr eV)</Units>
141 141 <RenderingHints>
142 142 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml
  Diff comments   View file @a3893d0
... ... @@ -308,7 +308,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
308 308 <Name>sunspot number</Name>
309 309 <ParameterKey>omni_sunspots</ParameterKey>
310 310 <Description>Daily sunspot number</Description>
311   - <UCD>phys.count</UCD>
  311 + <UCD>meta.number</UCD>
312 312 <RenderingHints>
313 313 <DisplayType>TimeSeries</DisplayType>
314 314 </RenderingHints>
... ... @@ -330,7 +330,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
330 330 <Parameter>
331 331 <Name>sw integral proton fluxes</Name>
332 332 <ParameterKey>omni_hour_pflux</ParameterKey>
333   - <UCD>phys.count</UCD>
  333 + <UCD>phys.flux</UCD>
334 334 <RenderingHints>
335 335 <DisplayType>StackPlot</DisplayType>
336 336 </RenderingHints>
... ...
NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -57,7 +57,7 @@
57 57 <Name>h+ : perp flow</Name>
58 58 <ParameterKey>pho_h_perp</ParameterKey>
59 59 <Description>energy-time spectrogram of proton counts : perpendicular flow</Description>
60   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  60 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
61 61 <Units>cnts</Units>
62 62 <RenderingHints>
63 63 <DisplayType>Spectrogram</DisplayType>
... ... @@ -71,7 +71,7 @@
71 71 <Name>h+ : sunward flow</Name>
72 72 <ParameterKey>pho_h_sun</ParameterKey>
73 73 <Description>energy-time spectrogram of proton counts : sunward flow</Description>
74   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  74 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
75 75 <Units>cnts</Units>
76 76 <RenderingHints>
77 77 <DisplayType>Spectrogram</DisplayType>
... ... @@ -85,7 +85,7 @@
85 85 <Name>h+ : tailward flow</Name>
86 86 <ParameterKey>pho_h_tail</ParameterKey>
87 87 <Description>energy-time spectrogram of proton counts : tailward flow</Description>
88   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  88 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
89 89 <Units>cnts</Units>
90 90 <RenderingHints>
91 91 <DisplayType>Spectrogram</DisplayType>
... ... @@ -99,7 +99,7 @@
99 99 <Name>o+ : perp flow</Name>
100 100 <ParameterKey>pho_o_perp</ParameterKey>
101 101 <Description>energy-time spectrogram of heavy ion counts : perpendicular flow</Description>
102   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  102 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
103 103 <Units>cnts</Units>
104 104 <RenderingHints>
105 105 <DisplayType>Spectrogram</DisplayType>
... ... @@ -113,7 +113,7 @@
113 113 <Name>o+ : sunward flow</Name>
114 114 <ParameterKey>pho_o_sun</ParameterKey>
115 115 <Description>energy-time spectrogram of heavy ion counts : sunward flow</Description>
116   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  116 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
117 117 <Units>cnts</Units>
118 118 <RenderingHints>
119 119 <DisplayType>Spectrogram</DisplayType>
... ... @@ -127,7 +127,7 @@
127 127 <Name>o+ : tailward flow</Name>
128 128 <ParameterKey>pho_o_tail</ParameterKey>
129 129 <Description>energy-time spectrogram of heavy ion counts : tailward flow</Description>
130   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  130 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
131 131 <Units>cnts</Units>
132 132 <RenderingHints>
133 133 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer10/CPI/p10-cpi-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>proton int</Name>
65 65 <ParameterKey>p10_cpi_fpio</ParameterKey>
66   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  66 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
67 67 <Units>cm-2.sr-1.s-1</Units>
68 68 <RenderingHints>
69 69 <DisplayType>StackPlot</DisplayType>
... ... @@ -90,7 +90,7 @@
90 90 <Parameter>
91 91 <Name>proton diff</Name>
92 92 <ParameterKey>p10_cpi_fpdo</ParameterKey>
93   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  93 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
94 94 <Units>cm-2.sr-1.s-1.MeV-1</Units>
95 95 <RenderingHints>
96 96 <DisplayType>TimeSeries</DisplayType>
... ... @@ -104,7 +104,7 @@
104 104 <Parameter>
105 105 <Name>alpha diff</Name>
106 106 <ParameterKey>p10_cpi_fado</ParameterKey>
107   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  107 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
108 108 <Units>cm-2.sr-1.s-1.MeV-1</Units>
109 109 <RenderingHints>
110 110 <DisplayType>TimeSeries</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer10/CRT/p10-crt-ele.xml
  Diff comments   View file @a3893d0
... ... @@ -89,7 +89,7 @@
89 89 <Parameter>
90 90 <Name>flux_dif</Name>
91 91 <ParameterKey>p10_crt_fedo</ParameterKey>
92   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  92 + <UCD>phys.flux;phys.electron</UCD>
93 93 <Units>cm-2.sr-1.s-1.MeV-1</Units>
94 94 <RenderingHints>
95 95 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer10/CRT/p10-crt-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>flux_int</Name>
65 65 <ParameterKey>p10_crt_fpio</ParameterKey>
66   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  66 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
67 67 <Units>cm-2.sr-1.s-1</Units>
68 68 <RenderingHints>
69 69 <DisplayType>StackPlot</DisplayType>
... ... @@ -120,7 +120,7 @@
120 120 <Parameter>
121 121 <Name>flux_dif</Name>
122 122 <ParameterKey>p10_crt_fpdo</ParameterKey>
123   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  123 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
124 124 <Units>cm-2.sr-1.s-1.MeV-1</Units>
125 125 <RenderingHints>
126 126 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer10/GTT/p10-gtt-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -64,7 +64,7 @@
64 64 <Parameter>
65 65 <Name>flux_dif</Name>
66 66 <ParameterKey>p10_gtt_fpdo</ParameterKey>
67   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  67 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
68 68 <Units>cm-2.sr-1.s-1.MeV-1</Units>
69 69 <RenderingHints>
70 70 <DisplayType>StackPlot</DisplayType>
... ... @@ -96,7 +96,7 @@
96 96 <Parameter>
97 97 <Name>flux_int</Name>
98 98 <ParameterKey>p10_gtt_fpio</ParameterKey>
99   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  99 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
100 100 <Units>cm-2.sr-1.s-1</Units>
101 101 <RenderingHints>
102 102 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer11/CPI/p11-cpi-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>proton int</Name>
65 65 <ParameterKey>p11_cpi_fpio</ParameterKey>
66   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  66 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
67 67 <Units>cm-2.sr-1.s-1</Units>
68 68 <RenderingHints>
69 69 <DisplayType>Spectrogram</DisplayType>
... ... @@ -90,7 +90,7 @@
90 90 <Parameter>
91 91 <Name>proton diff</Name>
92 92 <ParameterKey>p11_cpi_fpdo</ParameterKey>
93   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  93 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
94 94 <Units>cm-2.sr-1.s-1.MeV-1</Units>
95 95 <RenderingHints>
96 96 <DisplayType>TimeSeries</DisplayType>
... ... @@ -104,7 +104,7 @@
104 104 <Parameter>
105 105 <Name>alpha diff</Name>
106 106 <ParameterKey>p11_cpi_fado</ParameterKey>
107   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  107 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
108 108 <Units>cm-2.sr-1.s-1.MeV-1</Units>
109 109 <RenderingHints>
110 110 <DisplayType>TimeSeries</DisplayType>
... ... @@ -117,7 +117,7 @@
117 117 <Parameter>
118 118 <Name>alpha int</Name>
119 119 <ParameterKey>p11_cpi_faio</ParameterKey>
120   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  120 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
121 121 <Units>cm-2.sr-1.s-1</Units>
122 122 <RenderingHints>
123 123 <DisplayType>TimeSeries</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer11/CRT/p11-crt-ele.xml
  Diff comments   View file @a3893d0
... ... @@ -89,7 +89,7 @@
89 89 <Parameter>
90 90 <Name>flux_dif</Name>
91 91 <ParameterKey>p11_crt_fedo</ParameterKey>
92   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  92 + <UCD>phys.flux;phys.electron</UCD>
93 93 <Units>cm-2.sr-1.s-1.MeV-1</Units>
94 94 <RenderingHints>
95 95 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer11/CRT/p11-crt-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>flux_int</Name>
65 65 <ParameterKey>p11_crt_fpio</ParameterKey>
66   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  66 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
67 67 <Units>cm-2.sr-1.s-1</Units>
68 68 <RenderingHints>
69 69 <DisplayType>StackPlot</DisplayType>
... ... @@ -120,7 +120,7 @@
120 120 <Parameter>
121 121 <Name>flux_dif</Name>
122 122 <ParameterKey>p11_crt_fpdo</ParameterKey>
123   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  123 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
124 124 <Units>cm-2.sr-1.s-1.MeV-1</Units>
125 125 <RenderingHints>
126 126 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Pioneer11/GTT/p11-gtt-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -64,7 +64,7 @@
64 64 <Parameter>
65 65 <Name>flux_dif</Name>
66 66 <ParameterKey>p11_gtt_fpdo</ParameterKey>
67   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  67 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
68 68 <Units>cm-2.sr-1.s-1.MeV-1</Units>
69 69 <RenderingHints>
70 70 <DisplayType>StackPlot</DisplayType>
... ... @@ -96,7 +96,7 @@
96 96 <Parameter>
97 97 <Name>flux_int</Name>
98 98 <ParameterKey>p11_gtt_fpio</ParameterKey>
99   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  99 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
100 100 <Units>cm-2.sr-1.s-1</Units>
101 101 <RenderingHints>
102 102 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-3d.xml
  Diff comments   View file @a3893d0
... ... @@ -127,7 +127,7 @@
127 127 <Parameter>
128 128 <Name> cnts per cem ##anode##</Name>
129 129 <ParameterKey>pas_3d_spec</ParameterKey>
130   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  130 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
131 131 <Units>cnts</Units>
132 132 <RenderingHints>
133 133 <DisplayType>Spectrogram</DisplayType>
... ... @@ -139,7 +139,7 @@
139 139 <Parameter>
140 140 <Name>cnts sum on elev; cem/energy : 2D</Name>
141 141 <ParameterKey>pas_2d_elevation</ParameterKey>
142   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  142 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
143 143 <Units>cnts</Units>
144 144 <RenderingHints>
145 145 <DisplayType>Spectrogram</DisplayType>
... ... @@ -152,7 +152,7 @@
152 152 <Parameter>
153 153 <Name>cnts sum on cem; elev/energy : 2D</Name>
154 154 <ParameterKey>pas_2d_cem</ParameterKey>
155   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  155 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
156 156 <Units>cnts</Units>
157 157 <RenderingHints>
158 158 <DisplayType>Spectrogram</DisplayType>
... ... @@ -165,7 +165,7 @@
165 165 <Parameter>
166 166 <Name>cnts sum on energy; cem/elev : 2D</Name>
167 167 <ParameterKey>pas_2d_energy</ParameterKey>
168   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  168 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
169 169 <Units>cnts</Units>
170 170 <RenderingHints>
171 171 <DisplayType>Spectrogram</DisplayType>
... ... @@ -178,7 +178,7 @@
178 178 <Parameter>
179 179 <Name>cnts sum per cem ##anode##</Name>
180 180 <ParameterKey>pas_3d_sum</ParameterKey>
181   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  181 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
182 182 <Units>cnts</Units>
183 183 <Support>
184 184 <SupportQuantity>Other</SupportQuantity>
... ... @@ -187,7 +187,7 @@
187 187 <Parameter>
188 188 <Name>total cnts</Name>
189 189 <ParameterKey>pas_3d_tot</ParameterKey>
190   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  190 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
191 191 <Units>cnts</Units>
192 192 <Support>
193 193 <SupportQuantity>Other</SupportQuantity>
... ...
NumericalData/CDPP-AMDA/VEX/ELS/vex-els-all.xml
  Diff comments   View file @a3893d0
... ... @@ -75,7 +75,7 @@
75 75 <Name>counts : per anode ##anode##</Name>
76 76 <ParameterKey>vex_els_spec</ParameterKey>
77 77 <Description>Averaged energy-time spectrogram of electron counts</Description>
78   - <UCD>phys.count;phys.electron</UCD>
  78 + <UCD>phys.flux;phys.electron</UCD>
79 79 <Units>cnts</Units>
80 80 <RenderingHints>
81 81 <DisplayType>Spectrogram</DisplayType>
... ... @@ -92,7 +92,7 @@
92 92 <Name>counts : sum over anodes</Name>
93 93 <ParameterKey>vex_els_spec_sum</ParameterKey>
94 94 <Description>energy spectrogram of electron counts</Description>
95   - <UCD>phys.count;phys.electron</UCD>
  95 + <UCD>phys.flux;phys.electron</UCD>
96 96 <Units>cnts</Units>
97 97 <RenderingHints>
98 98 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-extra.xml
  Diff comments   View file @a3893d0
... ... @@ -64,7 +64,7 @@
64 64 <Name>protons : cnts per anode ##anode##</Name>
65 65 <ParameterKey>vex_h_spec</ParameterKey>
66 66 <Description>energy-time spectrogram of proton counts</Description>
67   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  67 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
68 68 <Units>cnts</Units>
69 69 <RenderingHints>
70 70 <DisplayType>Spectrogram</DisplayType>
... ... @@ -78,7 +78,7 @@
78 78 <Name>protons : cnts sum</Name>
79 79 <ParameterKey>vex_h_spec_sum</ParameterKey>
80 80 <Description>energy-time spectrogram of proton counts</Description>
81   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  81 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
82 82 <Units>cnts</Units>
83 83 <RenderingHints>
84 84 <DisplayType>Spectrogram</DisplayType>
... ... @@ -92,7 +92,7 @@
92 92 <Name>protons : diff fluxes</Name>
93 93 <ParameterKey>vex_h_flux</ParameterKey>
94 94 <Description>energy-time spectrogram of proton diff fluxes</Description>
95   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  95 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
96 96 <Units>cnts/(cm^2 s sr eV)</Units>
97 97 <RenderingHints>
98 98 <DisplayType>Spectrogram</DisplayType>
... ... @@ -106,7 +106,7 @@
106 106 <Name>heavy : cnts per anode ##anode##</Name>
107 107 <ParameterKey>vex_o_spec</ParameterKey>
108 108 <Description>energy-time spectrogram of heavy ion counts</Description>
109   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  109 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
110 110 <Units>cnts</Units>
111 111 <RenderingHints>
112 112 <DisplayType>Spectrogram</DisplayType>
... ... @@ -120,7 +120,7 @@
120 120 <Name>heavy : cnts sum</Name>
121 121 <ParameterKey>vex_o_spec_sum</ParameterKey>
122 122 <Description>energy-time spectrogram of heavy ion counts</Description>
123   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  123 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
124 124 <Units>cnts</Units>
125 125 <RenderingHints>
126 126 <DisplayType>Spectrogram</DisplayType>
... ... @@ -134,7 +134,7 @@
134 134 <Name>heavy_ions : diff fluxes</Name>
135 135 <ParameterKey>vex_o_flux</ParameterKey>
136 136 <Description>energy-time spectrogram of heavy ion diff fluxes</Description>
137   - <UCD>phys.count;phys.atmol.ionStage</UCD>
  137 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
138 138 <Units>cnts/(cm^2 s sr eV)</Units>
139 139 <RenderingHints>
140 140 <DisplayType>Spectrogram</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-ele.xml
  Diff comments   View file @a3893d0
... ... @@ -68,7 +68,7 @@
68 68 <Name>diff flux</Name>
69 69 <ParameterKey>vo1_crs_fedo</ParameterKey>
70 70 <Description>Differential Electrons Flux</Description>
71   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  71 + <UCD>phys.flux;phys.electron</UCD>
72 72 <Units>cm-2.s-1.sr-1.MeV-1</Units>
73 73 <RenderingHints>
74 74 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -68,7 +68,7 @@
68 68 <Name>flux integral</Name>
69 69 <ParameterKey>vo1_crs_fpio</ParameterKey>
70 70 <Description>Integrated Proton Flux</Description>
71   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  71 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
72 72 <Units>cm-2.s-1.sr-1.MeV-1</Units>
73 73 <RenderingHints>
74 74 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-ele.xml
  Diff comments   View file @a3893d0
... ... @@ -72,7 +72,7 @@
72 72 <Name>flux diff</Name>
73 73 <ParameterKey>vo1_lecp_fedo</ParameterKey>
74 74 <Description>Differential Electron Flux</Description>
75   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  75 + <UCD>phys.flux;phys.electron</UCD>
76 76 <Units>cm-2.s-1.sr-1.MeV-1</Units>
77 77 <RenderingHints>
78 78 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -73,7 +73,7 @@
73 73 <Name>flux diff : protons</Name>
74 74 <ParameterKey>vo1_lecp_fpdo</ParameterKey>
75 75 <Description>Differential Proton Flux</Description>
76   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  76 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
77 77 <Units>cm-2.s-1.sr-1.MeV-1</Units>
78 78 <RenderingHints>
79 79 <DisplayType>StackPlot</DisplayType>
... ... @@ -130,7 +130,7 @@
130 130 <Name>aflux diff : alphas</Name>
131 131 <ParameterKey>vo1_lecp_fado</ParameterKey>
132 132 <Description>Integrated Alpha Flux</Description>
133   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  133 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
134 134 <Units>cm-2.s-1.sr-1.MeV-1</Units>
135 135 <RenderingHints>
136 136 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-ele.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>flux diff</Name>
65 65 <ParameterKey>vo2_crs_fedo</ParameterKey>
66   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  66 + <UCD>phys.flux;phys.electron</UCD>
67 67 <Units>cm-2.s-1.sr-1.MeV-1</Units>
68 68 <RenderingHints>
69 69 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>flux integral</Name>
65 65 <ParameterKey>vo2_crs_fpio</ParameterKey>
66   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  66 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
67 67 <Units>cm-2.s-1.sr-1.MeV-1</Units>
68 68 <RenderingHints>
69 69 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-urad1.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>d1 countrate</Name>
65 65 <ParameterKey>vo2_urad1_count</ParameterKey>
66   - <UCD>arith.rate;phys.count</UCD>
  66 + <UCD>arith.rate</UCD>
67 67 <Units>counts</Units>
68 68 <RenderingHints>
69 69 <DisplayType>TimeSeries</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-urad2.xml
  Diff comments   View file @a3893d0
... ... @@ -63,7 +63,7 @@
63 63 <Parameter>
64 64 <Name>d2 countrate</Name>
65 65 <ParameterKey>vo2_urad2_count</ParameterKey>
66   - <UCD>arith.rate;phys.count</UCD>
  66 + <UCD>arith.rate</UCD>
67 67 <Units>counts</Units>
68 68 <RenderingHints>
69 69 <DisplayType>TimeSeries</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-ele.xml
  Diff comments   View file @a3893d0
... ... @@ -69,7 +69,7 @@
69 69 <Parameter>
70 70 <Name>flux diff</Name>
71 71 <ParameterKey>vo2_lecp_fedo</ParameterKey>
72   - <UCD>phys.flux;phys.count;phys.electron</UCD>
  72 + <UCD>phys.flux;phys.electron</UCD>
73 73 <Units>cm-2.s-1.sr-1.MeV-1</Units>
74 74 <RenderingHints>
75 75 <DisplayType>StackPlot</DisplayType>
... ...
NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-ion.xml
  Diff comments   View file @a3893d0
... ... @@ -70,7 +70,7 @@
70 70 <Parameter>
71 71 <Name>flux diff : protons</Name>
72 72 <ParameterKey>vo2_lecp_fpdo</ParameterKey>
73   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  73 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
74 74 <Units>cm-2.s-1.sr-1.MeV-1</Units>
75 75 <RenderingHints>
76 76 <DisplayType>StackPlot</DisplayType>
... ... @@ -126,7 +126,7 @@
126 126 <Parameter>
127 127 <Name>flux diff : alphas</Name>
128 128 <ParameterKey>vo2_lecp_fado</ParameterKey>
129   - <UCD>phys.flux;phys.count;phys.atmol.ionStage</UCD>
  129 + <UCD>phys.flux;phys.atmol.ionStage</UCD>
130 130 <Units>cm-2.s-1.sr-1.MeV-1</Units>
131 131 <RenderingHints>
132 132 <DisplayType>StackPlot</DisplayType>
... ...