Commit 73cf006619abed7079699407c5b78c04e04677d3
1 parent
ca6a51b7
Exists in
master
and in
10 other branches
Merge cass-caps-*** from amdadev
Showing
2 changed files
with
46 additions
and
6 deletions
Show diff stats
NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml
| ... | ... | @@ -56,18 +56,38 @@ |
| 56 | 56 | </Support> |
| 57 | 57 | </Parameter> |
| 58 | 58 | <Parameter> |
| 59 | - <Name>elec countrate</Name> | |
| 59 | + <Name>elec countrate @@ANODE@@</Name> | |
| 60 | 60 | <ParameterKey>cass_caps_els</ParameterKey> |
| 61 | - <Description>electron count rate</Description> | |
| 61 | + <Description>energy spectrogram of electron count rates</Description> | |
| 62 | 62 | <Ucd>phys.count;phys.electron;arith.rate</Ucd> |
| 63 | 63 | <Units>cnts.s^-1</Units> |
| 64 | 64 | <RenderingHints> |
| 65 | 65 | <DisplayType>Spectrogram</DisplayType> |
| 66 | 66 | </RenderingHints> |
| 67 | + <Structure> | |
| 68 | + <Size>63</Size> | |
| 69 | + </Structure> | |
| 67 | 70 | <Particle> |
| 68 | 71 | <ParticleType>Electron</ParticleType> |
| 69 | 72 | <ParticleQuantity>CountRate</ParticleQuantity> |
| 70 | 73 | </Particle> |
| 71 | - </Parameter> | |
| 74 | + </Parameter> | |
| 75 | + <Parameter> | |
| 76 | + <Name>elec countrate : sum over anodes</Name> | |
| 77 | + <ParameterKey>cass_caps_els_sum</ParameterKey> | |
| 78 | + <Description>energy spectrogram of electron count rates</Description> | |
| 79 | + <Ucd>phys.count;phys.electron;arith.rate</Ucd> | |
| 80 | + <Units>cnts.s^-1</Units> | |
| 81 | + <RenderingHints> | |
| 82 | + <DisplayType>Spectrogram</DisplayType> | |
| 83 | + </RenderingHints> | |
| 84 | + <Structure> | |
| 85 | + <Size>63</Size> | |
| 86 | + </Structure> | |
| 87 | + <Particle> | |
| 88 | + <ParticleType>Electron</ParticleType> | |
| 89 | + <ParticleQuantity>CountRate</ParticleQuantity> | |
| 90 | + </Particle> | |
| 91 | + </Parameter> | |
| 72 | 92 | </NumericalData> |
| 73 | 93 | </Spase> |
| ... | ... |
NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml
| ... | ... | @@ -55,18 +55,38 @@ |
| 55 | 55 | </Support> |
| 56 | 56 | </Parameter> |
| 57 | 57 | <Parameter> |
| 58 | - <Name>ion countrate</Name> | |
| 58 | + <Name>ion countrate @@ANODE@@</Name> | |
| 59 | 59 | <ParameterKey>cass_caps_sng</ParameterKey> |
| 60 | - <Description>Energy-time spectrogram of ion count rates</Description> | |
| 60 | + <Description>energy spectrogram of ion count rates</Description> | |
| 61 | 61 | <Ucd>phys.count;phys.atmol.ionStage;arith.rate</Ucd> |
| 62 | 62 | <Units>cnts.s^-1</Units> |
| 63 | 63 | <RenderingHints> |
| 64 | 64 | <DisplayType>Spectrogram</DisplayType> |
| 65 | 65 | </RenderingHints> |
| 66 | + <Structure> | |
| 67 | + <Size>63</Size> | |
| 68 | + </Structure> | |
| 66 | 69 | <Particle> |
| 67 | 70 | <ParticleType>Ion</ParticleType> |
| 68 | 71 | <ParticleQuantity>CountRate</ParticleQuantity> |
| 69 | 72 | </Particle> |
| 70 | - </Parameter> | |
| 73 | + </Parameter> | |
| 74 | + <Parameter> | |
| 75 | + <Name>ion countrate : sum over anodes</Name> | |
| 76 | + <ParameterKey>cass_caps_sng_sum</ParameterKey> | |
| 77 | + <Description>energy spectrogram of ion count rates</Description> | |
| 78 | + <Ucd>phys.count;phys.atmol.ionStage;arith.rate</Ucd> | |
| 79 | + <Units>cnts.s^-1</Units> | |
| 80 | + <RenderingHints> | |
| 81 | + <DisplayType>Spectrogram</DisplayType> | |
| 82 | + </RenderingHints> | |
| 83 | + <Structure> | |
| 84 | + <Size>63</Size> | |
| 85 | + </Structure> | |
| 86 | + <Particle> | |
| 87 | + <ParticleType>Ion</ParticleType> | |
| 88 | + <ParticleQuantity>CountRate</ParticleQuantity> | |
| 89 | + </Particle> | |
| 90 | + </Parameter> | |
| 71 | 91 | </NumericalData> |
| 72 | 92 | </Spase> |
| ... | ... |