From 039fc9bafd9158c48dacc8ceac37c4d27fac5ea3 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Mon, 2 May 2016 12:00:10 +0200
Subject: [PATCH] work

---
 NumericalData/AMDA/ACE/MFI/ace-imf-all.xml                    |  2 +-
 NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml |  2 +-
 NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml  |  2 +-
 NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml |  2 +-
 NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml  |  2 +-
 NumericalData/AMDA/MGS/Proxy/mgs-proxy-drap.xml               | 27 ++++++++++++++++++---------
 NumericalData/AMDA/MGS/Proxy/mgs-proxy-euv.xml                | 35 ++++++++++++++++++++++++++---------
 NumericalData/AMDA/MGS/Proxy/mgs-proxy-subsol.xml             | 25 ++++++++++++++++---------
 NumericalData/AMDA/Rosetta/LAP/ros-lap-est.xml                |  2 +-
 NumericalData/AMDA/Rosetta/LAP/ros-lap1-1d.xml                |  2 +-
 NumericalData/AMDA/Rosetta/LAP/ros-lap1-sweep.xml             |  2 +-
 NumericalData/AMDA/Rosetta/LAP/ros-lap2-1d.xml                |  2 +-
 NumericalData/AMDA/Rosetta/LAP/ros-lap2-sweep.xml             |  2 +-
 13 files changed, 70 insertions(+), 37 deletions(-)

diff --git a/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml b/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
index 34eb127..5075f45 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
@@ -58,7 +58,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2015-05-09T23:59:57Z</StopDate>
+             <StopDate>2016-04-09T23:59:49Z</StopDate>
          </TimeSpan>
          <Cadence>PT16S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml
index a9ea584..b52e047 100644
--- a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml
+++ b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml
@@ -36,7 +36,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2004-01-01T00:30:30Z</StartDate>
-                <StopDate>2014-06-30T22:52:30Z</StopDate>                
+                <StopDate>2015-06-30T22:52:30Z</StopDate>                
             </TimeSpan>
             <Cadence>PT1H</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml
index 7e0d029..717ce33 100644
--- a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml
+++ b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml
@@ -36,7 +36,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2004-01-01T00:00:30Z</StartDate>
-                <StopDate>2014-06-30T23:59:30Z</StopDate>                
+                <StopDate>2015-06-30T23:59:30Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml
index d90df5e..4568532 100644
--- a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml
+++ b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml
@@ -33,7 +33,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2004-01-01T00:30:00Z</StartDate>
-                <StopDate>2014-06-30T23:30:00Z</StopDate>                
+                <StopDate>2015-06-30T23:30:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT1H</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml
index e8bf23d..c8f9ccc 100644
--- a/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml
+++ b/NumericalData/AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml
@@ -33,7 +33,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2004-01-01T00:00:30Z</StartDate>
-                <StopDate>2014-06-30T23:59:30Z</StopDate>                
+                <StopDate>2015-06-30T23:59:30Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/MGS/Proxy/mgs-proxy-drap.xml b/NumericalData/AMDA/MGS/Proxy/mgs-proxy-drap.xml
index 705e0d6..803370d 100644
--- a/NumericalData/AMDA/MGS/Proxy/mgs-proxy-drap.xml
+++ b/NumericalData/AMDA/MGS/Proxy/mgs-proxy-drap.xml
@@ -4,20 +4,19 @@
    <NumericalData>
       <ResourceID>spase://CDPP/NumericalData/AMDA/MGS/PROXY/mgs-proxy-drap</ResourceID>
       <ResourceHeader>
-         <ResourceName>IMF_draping_dir</ResourceName>
+         <ResourceName>IMF draping direction</ResourceName>
          <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
          <Description>                        
          </Description>
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>M.Acuna</PersonID>
+            <PersonID>D.Brain</PersonID>
             <Role/>
          </Contact>
          <InformationURL>
            <Name/>
-           <URL>              
-           </URL>
+           <URL>http://lasp.colorado.edu/mop/people/brain/Resources_files/proxies/drapingdirxn.html</URL>
            <Description>             
            </Description>
          </InformationURL>       
@@ -32,21 +31,31 @@
                 http://amda.cdpp.eu
             </URL>
          </AccessURL>
-         <Format/>
+         <Format>NetCDF</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/MGS/PROXY</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>1999-04-02T15:50:49Z</StartDate>
              <StopDate>2006-10-27T14:20:34Z</StopDate>
          </TimeSpan>
-      <Cadence_Min>7000s</Cadence_Min><Cadence_Max>7200s</Cadence_Max></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence_Min>PT2H</Cadence_Min>
+      <Cadence_Max>PT2H</Cadence_Max>
+       </TemporalDescription>
+      <ObservedRegion>Mars</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter><Name>draping_azymuth_ang</Name><ParameterKey>mgs_drap_ang</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter></NumericalData>
+<Parameter>
+   <Name>draping_azimuth_ang</Name>
+   <ParameterKey>mgs_drap_ang</ParameterKey>
+   <Description/>
+   <Ucd/>
+   <Units>deg</Units>
+   <UnitsConversion/>
+</Parameter>
+ </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/MGS/Proxy/mgs-proxy-euv.xml b/NumericalData/AMDA/MGS/Proxy/mgs-proxy-euv.xml
index 926704f..1332c57 100644
--- a/NumericalData/AMDA/MGS/Proxy/mgs-proxy-euv.xml
+++ b/NumericalData/AMDA/MGS/Proxy/mgs-proxy-euv.xml
@@ -11,13 +11,12 @@
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>M.Acuna</PersonID>
+            <PersonID>D.Brain</PersonID>
             <Role/>
          </Contact>
          <InformationURL>
            <Name/>
-           <URL>              
-           </URL>
+           <URL>http://lasp.colorado.edu/mop/people/brain/Resources_files/proxies/drapingdirxn.html</URL>
            <Description>             
            </Description>
          </InformationURL>       
@@ -32,21 +31,39 @@
                 http://amda.cdpp.eu
             </URL>
          </AccessURL>
-         <Format/>
+         <Format>NetCDF</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
-      <ProviderName/> 
+      <ProviderName>D.Brain </ProviderName> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/MGS/PROXY</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>Irradiance</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>1999-01-01T00:00:00Z</StartDate>
              <StopDate>2006-12-31T22:00:00Z</StopDate>
          </TimeSpan>
-      <Cadence_Min>3600s</Cadence_Min><Cadence_Max>7200s</Cadence_Max></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence_Min>PT1H</Cadence_Min>
+       <Cadence_Max>PT2H</Cadence_Max>
+      </TemporalDescription>
+      <ObservedRegion>Mars</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter><Name>flux_earth</Name><ParameterKey>mgs_euv_earth</ParameterKey><Description/><Ucd/><Units>sfu</Units><UnitsConversion/></Parameter><Parameter><Name>flux_mars</Name><ParameterKey>mgs_euv_mars</ParameterKey><Description/><Ucd/><Units>sfu</Units><UnitsConversion/></Parameter></NumericalData>
+<Parameter>
+   <Name>flux_earth</Name>
+   <ParameterKey>mgs_euv_earth</ParameterKey>
+   <Description/>
+   <Ucd/>
+   <Units>sfu</Units>
+   <UnitsConversion/>
+</Parameter>
+ <Parameter>
+   <Name>flux_mars</Name>
+   <ParameterKey>mgs_euv_mars</ParameterKey>
+   <Description/>
+   <Ucd/>
+   <Units>sfu</Units>
+   <UnitsConversion/>
+</Parameter>
+</NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/MGS/Proxy/mgs-proxy-subsol.xml b/NumericalData/AMDA/MGS/Proxy/mgs-proxy-subsol.xml
index 53f2458..d20e9e4 100644
--- a/NumericalData/AMDA/MGS/Proxy/mgs-proxy-subsol.xml
+++ b/NumericalData/AMDA/MGS/Proxy/mgs-proxy-subsol.xml
@@ -4,20 +4,19 @@
    <NumericalData>
       <ResourceID>spase://CDPP/NumericalData/AMDA/MGS/PROXY/mgs-proxy-subsol</ResourceID>
       <ResourceHeader>
-         <ResourceName>Subsolar_bmag_strength</ResourceName>
+         <ResourceName>subsolar b strength</ResourceName>
          <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
          <Description>                        
          </Description>
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>M.Acuna</PersonID>
+            <PersonID>D.Brain</PersonID>
             <Role/>
          </Contact>
          <InformationURL>
            <Name/>
-           <URL>              
-           </URL>
+           <URL>http://lasp.colorado.edu/mop/people/brain/Resources_files/proxies/drapingdirxn.html</URL>
            <Description>             
            </Description>
          </InformationURL>       
@@ -32,21 +31,29 @@
                 http://amda.cdpp.eu
             </URL>
          </AccessURL>
-         <Format/>
+         <Format>NetCDF</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/MGS/PROXY</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>MagneticField</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>1999-04-02T15:45:28Z</StartDate>
              <StopDate>2006-10-27T14:20:34Z</StopDate>
          </TimeSpan>
-      <Cadence_Min>7000s</Cadence_Min><Cadence_Max>7200s</Cadence_Max></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence_Min>PT2H</Cadence_Min><Cadence_Max>PT2H</Cadence_Max></TemporalDescription>
+      <ObservedRegion>Mars</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter><Name>bmag_strength</Name><ParameterKey>mgs_subsol_bmag</ParameterKey><Description/><Ucd/><Units>nT</Units><UnitsConversion/></Parameter></NumericalData>
+<Parameter>
+   <Name>|b|</Name>
+   <ParameterKey>mgs_subsol_bmag</ParameterKey>
+   <Description/>
+   <Ucd/>
+   <Units>nT</Units>
+   <UnitsConversion/>
+</Parameter>
+</NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/Rosetta/LAP/ros-lap-est.xml b/NumericalData/AMDA/Rosetta/LAP/ros-lap-est.xml
index 43395be..eaff611 100644
--- a/NumericalData/AMDA/Rosetta/LAP/ros-lap-est.xml
+++ b/NumericalData/AMDA/Rosetta/LAP/ros-lap-est.xml
@@ -42,7 +42,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-05-09T15:23:00Z</StartDate>
-             <StopDate>2015-10-23T23:19:23Z</StopDate>
+             <StopDate>2016-04-15T01:38:09Z</StopDate>
          </TimeSpan>
       <Cadence_Min>4s</Cadence_Min><Cadence_Max>512</Cadence_Max></TemporalDescription>
       <ObservedRegion/>
diff --git a/NumericalData/AMDA/Rosetta/LAP/ros-lap1-1d.xml b/NumericalData/AMDA/Rosetta/LAP/ros-lap1-1d.xml
index d97d04f..85c29ca 100644
--- a/NumericalData/AMDA/Rosetta/LAP/ros-lap1-1d.xml
+++ b/NumericalData/AMDA/Rosetta/LAP/ros-lap1-1d.xml
@@ -42,7 +42,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-05-09T15:22:56Z</StartDate>
-             <StopDate>2015-06-26T23:58:08Z</StopDate>
+             <StopDate>2016-04-15T01:40:00Z</StopDate>
          </TimeSpan>
       <Cadence>32s</Cadence></TemporalDescription>
       <ObservedRegion/>
diff --git a/NumericalData/AMDA/Rosetta/LAP/ros-lap1-sweep.xml b/NumericalData/AMDA/Rosetta/LAP/ros-lap1-sweep.xml
index 909daba..38f5d34 100644
--- a/NumericalData/AMDA/Rosetta/LAP/ros-lap1-sweep.xml
+++ b/NumericalData/AMDA/Rosetta/LAP/ros-lap1-sweep.xml
@@ -42,7 +42,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-05-09T15:23:00Z</StartDate>
-             <StopDate>2016-03-31T23:58:55Z</StopDate>
+             <StopDate>2016-04-15T01:40:16Z</StopDate>
          </TimeSpan>
       <Cadence_Min>64s</Cadence_Min><Cadence_Max>512</Cadence_Max></TemporalDescription>
       <ObservedRegion/>
diff --git a/NumericalData/AMDA/Rosetta/LAP/ros-lap2-1d.xml b/NumericalData/AMDA/Rosetta/LAP/ros-lap2-1d.xml
index 5a9c54a..39f1a18 100644
--- a/NumericalData/AMDA/Rosetta/LAP/ros-lap2-1d.xml
+++ b/NumericalData/AMDA/Rosetta/LAP/ros-lap2-1d.xml
@@ -42,7 +42,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-05-09T15:22:56Z</StartDate>
-             <StopDate>2015-06-25T23:56:32Z</StopDate>
+             <StopDate>2016-04-15T01:40:00Z</StopDate>
          </TimeSpan>
       <Cadence>32s</Cadence></TemporalDescription>
       <ObservedRegion/>
diff --git a/NumericalData/AMDA/Rosetta/LAP/ros-lap2-sweep.xml b/NumericalData/AMDA/Rosetta/LAP/ros-lap2-sweep.xml
index f350045..3067ae0 100644
--- a/NumericalData/AMDA/Rosetta/LAP/ros-lap2-sweep.xml
+++ b/NumericalData/AMDA/Rosetta/LAP/ros-lap2-sweep.xml
@@ -42,7 +42,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-05-09T15:23:32Z</StartDate>
-             <StopDate>2016-03-31T12:54:23Z</StopDate>
+             <StopDate>2016-04-15T01:38:08Z</StopDate>
          </TimeSpan>
       <Cadence_Min>64s</Cadence_Min><Cadence_Max>512</Cadence_Max></TemporalDescription>
       <ObservedRegion/>
--
libgit2 0.21.2