CDPP / CNES

Commit f7d65c72da01b70906615f6ad8abc0e1712d76c9

Authored by Quentin Brzustowski
2 parents d061ca03 a9b01983
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 5 changed files with 25 additions and 12 deletions   Show diff stats
Inline Side-by-side
Instrument/CDPP-AMDA/Bepi/MEA1.xml
  Diff comments   View file @f7d65c7
... ... @@ -7,15 +7,18 @@
7 7 <ResourceName>MEA1</ResourceName>
8 8 <AlternateName>Mercury Electron Analyzer 1 </AlternateName>
9 9 <ReleaseDate>2017-05-20T21:10:13Z</ReleaseDate>
10   - <Description></Description>
  10 + <Description>The Mercury Electron Analyzers are part of the Mercury Plasma Particle Environment suite onboard the
  11 + BepiColombo Mio spacecraft.
  12 +
  13 + The Mercury Electron Analyzers have been developed at IRAP with the support of CNES.</Description>
11 14 <Acknowledgement/>
12 15 <Contact>
13   - <PersonID>spase://SMWG/Person/Yoshifumi.Saito</PersonID>
  16 + <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID>
14 17 <Role>PrincipalInvestigator</Role>
15 18 </Contact>
16 19 <Contact>
17   - <PersonID>spase://CDPP/Person/Nicolas.Andre</PersonID>
18   - <Role>PrincipalInvestigator</Role>
  20 + <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
  21 + <Role>CoInvestigator</Role>
19 22 </Contact>
20 23 <PriorID/>
21 24 </ResourceHeader>
... ...
Instrument/CDPP-AMDA/Bepi/MEA2.xml
  Diff comments   View file @f7d65c7
... ... @@ -7,15 +7,18 @@
7 7 <ResourceName>MEA2</ResourceName>
8 8 <AlternateName>Mercury Electron Analyzer 2</AlternateName>
9 9 <ReleaseDate>2017-05-20T21:10:13Z</ReleaseDate>
10   - <Description></Description>
  10 + <Description>The Mercury Electron Analyzers are part of the Mercury Plasma Particle Environment suite onboard the
  11 + BepiColombo Mio spacecraft.
  12 +
  13 + The Mercury Electron Analyzers have been developed at IRAP with the support of CNES.</Description>
11 14 <Acknowledgement/>
12 15 <Contact>
13   - <PersonID>spase://SMWG/Person/Yoshifumi.Saito</PersonID>
  16 + <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID>
14 17 <Role>PrincipalInvestigator</Role>
15 18 </Contact>
16 19 <Contact>
17   - <PersonID>spase://CDPP/Person/Nicolas.Andres</PersonID>
18   - <Role>PrincipalInvestigator</Role>
  20 + <PersonID>spase://CNES/Person/Nicolas.Andres</PersonID>
  21 + <Role>CoInvestigator</Role>
19 22 </Contact>
20 23 <PriorID/>
21 24 </ResourceHeader>
... ...
NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-omni16.xml
  Diff comments   View file @f7d65c7
... ... @@ -7,9 +7,13 @@
7 7 <ResourceName>electron : omni </ResourceName>
8 8 <ReleaseDate>2017-10-15T15:19:00Z</ReleaseDate>
9 9 <Description></Description>
  10 + <Contact>
  11 + <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID>
  12 + <Role>PrincipalInvestigator</Role>
  13 + </Contact>
10 14 <Contact>
11 15 <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
12   - <Role>PrincipalInvestigator</Role>
  16 + <Role>CoInvestigator</Role>
13 17 </Contact>
14 18 </ResourceHeader>
15 19 <AccessInformation>
... ...
NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-omni16.xml
  Diff comments   View file @f7d65c7
... ... @@ -7,9 +7,13 @@
7 7 <ResourceName>electron : omni </ResourceName>
8 8 <ReleaseDate>2017-10-15T15:19:00Z</ReleaseDate>
9 9 <Description></Description>
  10 + <Contact>
  11 + <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID>
  12 + <Role>PrincipalInvestigator</Role>
  13 + </Contact>
10 14 <Contact>
11 15 <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
12   - <Role>PrincipalInvestigator</Role>
  16 + <Role>CoInvestigator</Role>
13 17 </Contact>
14 18 </ResourceHeader>
15 19 <AccessInformation>
... ...
Person/Yoshifumi.Saito.xml
  Diff comments   View file @f7d65c7
... ... @@ -2,8 +2,7 @@
2 2 <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_0.xsd">
3 3 <Version>2.2.0</Version>
4 4 <Person>
5   - <ResourceID>spase://SMWG/Person/Yoshifumi.Saito</ResourceID>
6   - <ReleaseDate>2010-08-05T17:35:48Z</ReleaseDate>
  5 + <ResourceID>spase://CNES/Person/Yoshifumi.Saito</ResourceID>
7 6 <PersonName>Dr. Yoshifumi Saito</PersonName>
8 7 <OrganizationName>Institute of Space and Astronautical Science, Japan Aerospace Exploration Agency</OrganizationName>
9 8 <Address>3-1-1 Yoshinodai, Sagamihara, Kanagawa 229-8510, Japan</Address>
... ...