From b9cd002f6d00168ce206655112bf4e1ee81c742e Mon Sep 17 00:00:00 2001 From: Elena.Budnik <ebudnik@irap.omp.eu> Date: Wed, 26 Sep 2018 10:39:56 +0200 Subject: [PATCH] MEX/VEX IMA; SO PAS --- Instrument/AMDA/MEX/IMA.xml | 12 ++++++++++-- Instrument/AMDA/Solar_Orbiter/PAS.xml | 26 ++++++++++++++++++++++++++ Instrument/AMDA/VEX/IMA.xml | 2 +- NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml | 14 +++++++------- NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-3d.xml | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-hk.xml | 269 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 7 files changed, 437 insertions(+), 16 deletions(-) create mode 100644 Instrument/AMDA/Solar_Orbiter/PAS.xml create mode 100644 NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-3d.xml create mode 100644 NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-hk.xml diff --git a/Instrument/AMDA/MEX/IMA.xml b/Instrument/AMDA/MEX/IMA.xml index de24122..1493472 100644 --- a/Instrument/AMDA/MEX/IMA.xml +++ b/Instrument/AMDA/MEX/IMA.xml @@ -14,8 +14,16 @@ the matrix azimuth x mass.</Description> <Contact> <PersonID>spase://SMWG/Person/Stas.Barabash</PersonID> <Role>PrincipalInvestigator</Role> - </Contact> - </ResourceHeader> + </Contact> + <InformationURL> + <Name>ASPERA web page, IRF, Kiruna</Name><!--- AMDA help --> + <URL>http://www2.irf.se/aspera-3</URL><!--- AMDA help --> + </InformationURL> + <InformationURL> + <Name>MEX IMA/ELS Inventory Graph, IRAP, Toulouse</Name> + <URL>http://goezog.irap.omp.eu/DD_MARS/Inventory.html</URL> + </InformationURL> + </ResourceHeader> <InstrumentType>MassSpectrometer</InstrumentType> <InvestigationName>ASPERA3</InvestigationName> <ObservatoryID>spase://CDPP/Observatory/AMDA/MEX</ObservatoryID> diff --git a/Instrument/AMDA/Solar_Orbiter/PAS.xml b/Instrument/AMDA/Solar_Orbiter/PAS.xml new file mode 100644 index 0000000..0732754 --- /dev/null +++ b/Instrument/AMDA/Solar_Orbiter/PAS.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_2_6.xsd"> + <Version>2.2.6</Version> + <Instrument> + <ResourceID>spase://CDPP/Instrument/AMDA/Solar_Orbiter/PAS</ResourceID> + <ResourceHeader> + <ResourceName>PAS</ResourceName> + <AlternateName>Proton-Alpha Sensor</AlternateName> + <ReleaseDate></ReleaseDate> + <Description> + </Description> + <Acknowledgement></Acknowledgement> + <Contact> + <PersonID>spase://CDPP/Person/Andrei.Fedorov</PersonID> + <Role>PrincipalInvestigator</Role> + </Contact> + <InformationURL> + <Name></Name> + <URL></URL> + </InformationURL> + </ResourceHeader> + <InstrumentType>ParticleDetector</InstrumentType> + <InvestigationName>SWA</InvestigationName> + <ObservatoryID>spase://CDPP/Observatory/AMDA/SO</ObservatoryID> + </Instrument> +</Spase> diff --git a/Instrument/AMDA/VEX/IMA.xml b/Instrument/AMDA/VEX/IMA.xml index ab9b052..9d19462 100644 --- a/Instrument/AMDA/VEX/IMA.xml +++ b/Instrument/AMDA/VEX/IMA.xml @@ -26,7 +26,7 @@ the matrix azimuth x mass.</Description><!--- AMDA help --> </InformationURL> <InformationURL> <Name>VEX IMA/ELS Inventory Graph, IRAP, Toulouse</Name> - <URL>http://goezogt.irap.omp.eu/DD_VEX/inventory.html</URL> + <URL>http://goezog.irap.omp.eu/DD_VEX/Inventory.html</URL> </InformationURL> </ResourceHeader> <InstrumentType>MassSpectrometer</InstrumentType><!-- shown in instrument tooltip in the AMDA tree ; multiple tags possible--> diff --git a/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml b/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml index 304c71f..870a088 100644 --- a/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml +++ b/NumericalData/AMDA/MEX/IMA/mex-ima-extra.xml @@ -24,7 +24,7 @@ <AccessInformation> <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID> <Availability>Online</Availability> - <AccessRights>Restricted</AccessRights> + <AccessRights>Open</AccessRights> <AccessURL> <URL>http://amda.cdpp.eu</URL> </AccessURL> @@ -43,11 +43,11 @@ <ObservedRegion>Mars</ObservedRegion> <Caveats>Data gap 2015-05-24 - 2015-07-01</Caveats> <Parameter> - <Name>protons : counts</Name> + <Name>protons : cnts per anode ##anode##</Name> <ParameterKey>mex_h_spec</ParameterKey> <Description>energy-time spectrogram of proton counts</Description> <Ucd>phys.count;phys.atmol.ionStage</Ucd> - <Units>counts</Units> + <Units>cnts</Units> <RenderingHints> <DisplayType>Spectrogram</DisplayType> </RenderingHints> @@ -55,9 +55,9 @@ <ParticleType>Proton</ParticleType> <ParticleQuantity>Counts</ParticleQuantity> </Particle> - </Parameter> + </Parameter> <Parameter> - <Name>protons : diff fluxes</Name> + <Name>protons : fluxes per anode ##anode##</Name> <ParameterKey>mex_h_flux</ParameterKey> <Description>energy-time spectrogram of proton diff fluxes</Description> <Ucd>phys.count;phys.atmol.ionStage</Ucd> @@ -71,7 +71,7 @@ </Particle> </Parameter> <Parameter> - <Name>heavy_ions : counts</Name> + <Name>heavy : cnts per anode ##anode##</Name> <ParameterKey>mex_o_spec</ParameterKey> <Description>energy-time spectrogram of heavy ion counts</Description> <Ucd>phys.count;phys.atmol.ionStage</Ucd> @@ -85,7 +85,7 @@ </Particle> </Parameter> <Parameter> - <Name>heavy_ions : diff fluxes</Name> + <Name>heavy : fluxes per anode ##anode##</Name> <ParameterKey>mex_o_flux</ParameterKey> <Description>energy-time spectrogram of heavy ion diff fluxes</Description> <Ucd>phys.count;phys.atmol.ionStage</Ucd> diff --git a/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-3d.xml b/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-3d.xml new file mode 100644 index 0000000..2f30f56 --- /dev/null +++ b/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-3d.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd"> + <Version>2.2.6</Version> + <NumericalData> + <ResourceID>spase://CDPP/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-3d</ResourceID> + <ResourceHeader> + <ResourceName>3D</ResourceName> + <AlternateName/> + <ReleaseDate/> + <Description/> + <Acknowledgement/> + <Contact> + <PersonID>spase://CDPP/Person/Andrei.Fedorov</PersonID> + <Role>PrincipalInvestigator</Role> + </Contact> + <InformationURL> + <Name/> + <URL/> + <Description/> + </InformationURL> + </ResourceHeader> + <AccessInformation> + <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID> + <Availability>Online</Availability> + <AccessRights>Open</AccessRights> + <AccessURL> + <Name>AMDA at CDPP</Name> + <URL>http://amda.cdpp.eu</URL> + </AccessURL> + <Format>NetCDF</Format> + </AccessInformation> + <ProviderName>IRAP</ProviderName> + <ProviderResourceName/> + <InstrumentID>spase://CDPP/Instrument/AMDA/Solar_Orbiter/PAS</InstrumentID> + <MeasurementType>ThermalPlasma</MeasurementType> + <TemporalDescription> + <TimeSpan> + <StartDate>2017-07-07T16:22:18Z</StartDate> + <StopDate>2018-08-06T16:46:46Z</StopDate> + </TimeSpan> + <Cadence>PT4S</Cadence> + </TemporalDescription> + <ObservedRegion>Heliosphere.Inner</ObservedRegion> + <Parameter> + <Name>counts</Name> + <ParameterKey>pas_3d_cnts</ParameterKey> + <Description/> + <Ucd/> + <Units>cnts</Units> + </Parameter> + <Parameter> + <Name>energy : first</Name> + <ParameterKey>pas_3d_e0</ParameterKey> + <Description/> + <Ucd/> + <Units/> + </Parameter> + <Parameter> + <Name>energy : number</Name> + <ParameterKey>pas_3d_e_nb</ParameterKey> + <Description/> + <Ucd/> + <Units/> + </Parameter> + </NumericalData> +</Spase> diff --git a/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-hk.xml b/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-hk.xml new file mode 100644 index 0000000..1f4e1a3 --- /dev/null +++ b/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-hk.xml @@ -0,0 +1,269 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd"> + <Version>2.2.6</Version> + <NumericalData> + <ResourceID>spase://CDPP/NumericalData/AMDA/Solar_Orbiter/PAS/so-pas-hk</ResourceID> + <ResourceHeader> + <ResourceName>houskeeping</ResourceName> + <AlternateName/> + <ReleaseDate/> + <Description/> + <Acknowledgement/> + <Contact> + <PersonID>spase://CDPP/Person/Andrei.Fedorov</PersonID> + <Role>PrincipalInvestigator</Role> + </Contact> + <InformationURL> + <Name/> + <URL/> + <Description/> + </InformationURL> + </ResourceHeader> + <AccessInformation> + <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID> + <Availability>Online</Availability> + <AccessRights>Open</AccessRights> + <AccessURL> + <Name>AMDA at CDPP</Name> + <URL>http://amda.cdpp.eu</URL> + </AccessURL> + <Format>NetCDF</Format> + </AccessInformation> + <ProviderName>IRAP</ProviderName> + <ProviderResourceName/> + <InstrumentID>spase://CDPP/Instrument/AMDA/Solar_Orbiter/PAS</InstrumentID> + <MeasurementType>ThermalPlasma</MeasurementType> + <TemporalDescription> + <TimeSpan> + <StartDate>2016-08-22T10:39:26Z</StartDate> + <StopDate>2018-08-06T17:19:48Z</StopDate> + </TimeSpan> + <Cadence>PT10S</Cadence> + </TemporalDescription> + <ObservedRegion>Heliosphere.Inner</ObservedRegion> + <Parameter> + <Name>centr. CEM HV</Name> + <ParameterKey>pashk_cem_hv_centr</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>periph. CEM HV</Name> + <ParameterKey>pashk_cem_hv_perif</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>centr. CEM curr.</Name> + <ParameterKey>pashk_cem_curr_centr</ParameterKey> + <Description/> + <Ucd/> + <Units>uA</Units> + </Parameter> + <Parameter> + <Name>periph. CEM curr.</Name> + <ParameterKey>pashk_cem_curr_perif</ParameterKey> + <Description/> + <Ucd/> + <Units>uA</Units> + </Parameter> + <Parameter> + <Name>centr. CEM temp.</Name> + <ParameterKey>pashk_cem_temp_centr</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>periph. CEM temp.</Name> + <ParameterKey>pashk_cem_temp_perif</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>temp. heater1</Name> + <ParameterKey>pashk_heat1_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>temp. heater2</Name> + <ParameterKey>pashk_heat2_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>temp. heater3</Name> + <ParameterKey>pashk_heat3_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>temp. HVPS</Name> + <ParameterKey>pashk_hvps_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>temp. analyzer</Name> + <ParameterKey>pashk_anl_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>+24V for CEM</Name> + <ParameterKey>pashk_cem_24v</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>+5V for CEM</Name> + <ParameterKey>pashk_cem_5v</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>+12V for HVPS</Name> + <ParameterKey>pashk_hvps_p12v</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>-12V for HVPS</Name> + <ParameterKey>pashk_hvps_m12v</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>+3.5V for FPGA</Name> + <ParameterKey>pashk_fpga_3v5</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>+1.5V for FPGA</Name> + <ParameterKey>pashk_fpga_1v5</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>temp. DC-DC</Name> + <ParameterKey>pashk_dcdc_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>temp. FPGA</Name> + <ParameterKey>pashk_fpga_temp</ParameterKey> + <Description/> + <Ucd/> + <Units>C</Units> + </Parameter> + <Parameter> + <Name>+24V for CEM curr.</Name> + <ParameterKey>pashk_cem_24v_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>+5V for CEM curr.</Name> + <ParameterKey>pashk_cem_5v_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>+12V for HVPS curr.</Name> + <ParameterKey>pashk_hvps_p12v_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>-12V for HVPS curr.</Name> + <ParameterKey>pashk_hvps_m12v_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>+3.5V for FPGA curr.</Name> + <ParameterKey>pashk_fpga_3v5_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>+1.5V for FPGA curr.</Name> + <ParameterKey>pashk_fpga_1v5_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>+28V primary curr.</Name> + <ParameterKey>pashk_28v_prime_curr</ParameterKey> + <Description/> + <Ucd/> + <Units>mA</Units> + </Parameter> + <Parameter> + <Name>main + HV</Name> + <ParameterKey>pashk_main_phv</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>main - HV</Name> + <ParameterKey>pashk_main_mhv</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>analyzer HV</Name> + <ParameterKey>pashk_anl_hv</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>defl. top HV</Name> + <ParameterKey>pashk_top_hv</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>defl. bot HV</Name> + <ParameterKey>pashk_bot_hv</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + <Parameter> + <Name>top cap HV</Name> + <ParameterKey>pashk_topcap_hv</ParameterKey> + <Description/> + <Ucd/> + <Units>V</Units> + </Parameter> + </NumericalData> +</Spase> diff --git a/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml b/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml index 741037c..1324fac 100644 --- a/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml +++ b/NumericalData/AMDA/VEX/IMA/vex-ima-extra.xml @@ -8,15 +8,19 @@ <ReleaseDate>2015-10-13T17:00:00</ReleaseDate> <Description>Venus Express (VEX) ASPERA-4 Ion Mass Analyzer (IMA) data (spectrogram) Preliminary spectra obtained from Andrei Fedorov (IRAP)</Description> + <Contact> + <PersonID>spase://CDPP/Person/Andrei.Fedorov</PersonID> + <Role>GeneralContact</Role> + </Contact> <Contact> - <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID> + <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID> <Role>GeneralContact</Role> </Contact> </ResourceHeader> <AccessInformation> <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID> <Availability>Online</Availability> - <AccessRights>Restricted</AccessRights> + <AccessRights>Open</AccessRights> <AccessURL> <URL>http://amda.cdpp.eu</URL> </AccessURL> @@ -24,7 +28,7 @@ </AccessInformation> <ProviderName>IRAP</ProviderName> <InstrumentID>spase://CDPP/Instrument/AMDA/VEX/IMA</InstrumentID> - <MeasurementType>EnergeticParticles</MeasurementType> + <MeasurementType>ThermalPlasma</MeasurementType> <TemporalDescription> <TimeSpan> <StartDate>2005-06-08T03:58:28Z</StartDate> @@ -37,11 +41,11 @@ <Keyword>plasma</Keyword> <Keyword>ion</Keyword> <Parameter> - <Name>protons</Name> + <Name>protons : cnts per anode ##anode##</Name> <ParameterKey>vex_h_spec</ParameterKey> <Description>energy-time spectrogram of proton counts</Description> <Ucd>phys.count;phys.atmol.ionStage</Ucd> - <Units>counts</Units> + <Units>cnts</Units> <RenderingHints> <DisplayType>Spectrogram</DisplayType> </RenderingHints> @@ -50,8 +54,22 @@ <ParticleQuantity>Counts</ParticleQuantity> </Particle> </Parameter> + <Parameter> + <Name>protons : diff fluxes</Name> + <ParameterKey>vex_h_flux</ParameterKey> + <Description>energy-time spectrogram of proton diff fluxes</Description> + <Ucd>phys.count;phys.atmol.ionStage</Ucd> + <Units>cnts/(cm^2 s sr eV)</Units> + <RenderingHints> + <DisplayType>Spectrogram</DisplayType> + </RenderingHints> + <Particle> + <ParticleType>Proton</ParticleType> + <ParticleQuantity>NumberFlux</ParticleQuantity> + </Particle> + </Parameter> <Parameter> - <Name>heavy_ions</Name> + <Name>heavy_ions : cnts</Name> <ParameterKey>vex_o_spec</ParameterKey> <Description>energy-time spectrogram of heavy ion counts</Description> <Ucd>phys.count;phys.atmol.ionStage</Ucd> @@ -63,6 +81,40 @@ <ParticleType>Ion</ParticleType> <ParticleQuantity>Counts</ParticleQuantity> </Particle> + </Parameter> + <Parameter> + <Name>heavy_ions : diff fluxes</Name> + <ParameterKey>vex_o_flux</ParameterKey> + <Description>energy-time spectrogram of heavy ion diff fluxes</Description> + <Ucd>phys.count;phys.atmol.ionStage</Ucd> + <Units>cnts/(cm^2 s sr eV)</Units> + <RenderingHints> + <DisplayType>Spectrogram</DisplayType> + </RenderingHints> + <Particle> + <ParticleType>Ion</ParticleType> + <ParticleQuantity>NumberFlux</ParticleQuantity> + </Particle> + </Parameter> + <Parameter> + <Name>energy table</Name> + <ParameterKey>vex_energy_tab</ParameterKey> + <Description>energy table number</Description> + <Ucd/> + <Units/> + <Support> + <SupportQuantity>InstrumentMode</SupportQuantity> + </Support> + </Parameter> + <Parameter> + <Name>elevations number</Name> + <ParameterKey>vex_elev_n</ParameterKey> + <Description>Number of the elevation angles</Description> + <Ucd/> + <Units/> + <Support> + <SupportQuantity>InstrumentMode</SupportQuantity> + </Support> </Parameter> </NumericalData> </Spase> -- libgit2 0.21.2