From 1e2c1a4d3529085208c87ff0f128d31cc4d19b1f Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Mon, 27 Feb 2017 15:12:32 +0100
Subject: [PATCH] EPIC

---
 Instrument/AMDA/Geotail/EPIC.xml                | 30 ++++++++++++++++++++++++++++++
 NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml   | 41 ++++++++++++++++++++++++-----------------
 3 files changed, 114 insertions(+), 17 deletions(-)
 create mode 100644 Instrument/AMDA/Geotail/EPIC.xml
 create mode 100644 NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml

diff --git a/Instrument/AMDA/Geotail/EPIC.xml b/Instrument/AMDA/Geotail/EPIC.xml
new file mode 100644
index 0000000..159e0cf
--- /dev/null
+++ b/Instrument/AMDA/Geotail/EPIC.xml
@@ -0,0 +1,30 @@
+<?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/Geotail/EPIC</ResourceID>
+    <ResourceHeader>
+      <ResourceName>EPIC</ResourceName>
+      <AlternateName>Energetic Particles and Ion Composition instrument</AlternateName>
+      <ReleaseDate>2017-02-04T12:34:56.789</ReleaseDate>
+      <Description>The Energetic Particles and Ion Composition (EPIC) instrument (block diagram) is actually composed of two separate sensor and processing assemblies.
+    * The STICS assembly (Supra-Thermal Ion Composition Spectrometer) uses a quadrispherical electrostatic analyzer followed by a foil/solid state detector time-of-flight (TOF) telecope to measure charge state, mass and energy of ions with energies of 30 - 230 keV/charge. It uses an electrostatic analyzer with a geometry factor of 0.05 cm**2 sr, time of flight and energy analysis.
+    * The ICS assembly (Ion Composition Subsystem) measures mass and energy properties of energetic ions with energies of less than 50 keV to 3 MeV. It uses a pair of collimators with sweeping magnets to reject electrons, followed by TOF and energy analysis, with a geometry factor of 0.2 cm**2 sr. A thin foil/solid state detector electron telescope measures electrons higher than 30 keV. </Description>
+      <Acknowledgement></Acknowledgement>
+      <Contact>
+        <PersonID>spase://SMWG/Person/Donald.J.Williams</PersonID>
+        <Role>PrincipalInvestigator</Role>
+      </Contact>
+      <InformationURL>
+        <Name>EPIC description at JHU/APL</Name>
+        <URL>http://sd-www.jhuapl.edu/Geotail/epic_instr.html</URL>
+        <Description></Description>
+      </InformationURL>
+    </ResourceHeader>
+    <InstrumentType>QuadrisphericalAnalyser</InstrumentType>
+    <InstrumentType>TimeOfFlight</InstrumentType>
+    <InstrumentType>SolidStateDetector</InstrumentType>
+    <InvestigationName></InvestigationName>
+    <ObservatoryID>spase://CDPP/Observatory/AMDA/Geotail</ObservatoryID>
+  </Instrument>
+</Spase>
diff --git a/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml b/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
new file mode 100644
index 0000000..bbfbe2b
--- /dev/null
+++ b/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
@@ -0,0 +1,60 @@
+<?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://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
+   <Version>2.2.6</Version>
+   <NumericalData>
+      <ResourceID>spase://CDPP/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed</ResourceID>
+      <ResourceHeader>
+         <ResourceName>ED : electron flux</ResourceName>
+         <AlternateName>Electron Detector : </AlternateName>
+         <ReleaseDate>2017-02-12T10:48:29Z</ReleaseDate>
+         <Description>*'directionward' (tailward, etc) : the correspondinf sector is taken
+                      * Sectors (degrees) : 0., 45., 90., 135., 180., 225., 270., 315.; </Description>
+         <Acknowledgement></Acknowledgement>
+         <Contact>        
+             
+         </Contact>
+         <InformationURL>
+           <Name/>
+           <URL>              
+           </URL>
+           <Description>             
+           </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>CDF</Format>
+         <Acknowledgement></Acknowledgement>
+      </AccessInformation>
+      <ProviderName/> 
+      <InstrumentID>spase://CDPP/Instrument/AMDA/GEOTAIL/EPIC</InstrumentID>
+      <MeasurementType>EnergeticParticles</MeasurementType>
+      <TemporalDescription>
+         <TimeSpan>
+             <StartDate>2010-11-29T23:18:19Z</StartDate>
+             <StopDate>2016-02-02T23:56:45Z</StopDate>
+         </TimeSpan>
+      <Cadence>PT3S</Cadence>
+      </TemporalDescription>
+      <ObservedRegion>Comet</ObservedRegion>
+      <Caveats>
+      </Caveats>    
+      <Parameter>
+         <Name>integral flux : E > 34 keV</Name>
+         <ParameterKey>gtl_edhigh_av</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units></Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size> </Size>
+         </Structure>
+      </Parameter>
+</NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml b/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
index c7020ef..f307560 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
@@ -5,14 +5,12 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/Rosetta/IES/ros-elc-en</ResourceID>
       <ResourceHeader>
          <ResourceName>Electron energy spectra</ResourceName>
-         <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
-         <Description>                        
-         </Description>
-         <Acknowledgement>            
-         </Acknowledgement>
+         <ReleaseDate>2017-02-12T10:48:29Z</ReleaseDate>
+         <Description></Description>
+         <Acknowledgement></Acknowledgement>
          <Contact>        
-            <PersonID>James Burch</PersonID>
-            <Role/>
+            <PersonID>spase://CDPP/Person/Ray.Goldstein</PersonID>
+            <Role>GeneralContact</Role>
          </Contact>
          <InformationURL>
            <Name/>
@@ -28,25 +26,34 @@
          <AccessRights>Open</AccessRights>
          <AccessURL>
             <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
+            <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
-         <Format/>
-         <Acknowledgement>           
-         </Acknowledgement>
+         <Format>CDF</Format>
+         <Acknowledgement></Acknowledgement>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/Rosetta/IES</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>ThermalPlasma</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2010-11-29T23:18:19Z</StartDate>
              <StopDate>2016-02-02T23:56:45Z</StopDate>
          </TimeSpan>
-      <Cadence>32s</Cadence></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence>PT32S</Cadence>
+      </TemporalDescription>
+      <ObservedRegion>Comet</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter><Name>counts</Name><ParameterKey>ros_elc_spec</ParameterKey><Description/><Ucd/><Units>counts</Units><UnitsConversion/><Structure><Size>124</Size></Structure></Parameter></NumericalData>
+      <Parameter>
+         <Name>counts</Name>
+         <ParameterKey>ros_elc_spec</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Structure>
+            <Size>124</Size>
+         </Structure>
+      </Parameter>
+</NumericalData>
 </Spase>
--
libgit2 0.21.2