From a128b91d4fa6ea541bbef07a2f73eef98e286e51 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Mon, 21 Nov 2016 16:55:54 +0100
Subject: [PATCH] STAFF

---
 Instrument/AMDA/Cluster-Rumba/STAFF.xml                      |  29 ++++++++++++++++++++++-------
 Instrument/AMDA/Cluster-Salsa/STAFF.xml                      |  29 ++++++++++++++++++++++-------
 Instrument/AMDA/Cluster-Samba/STAFF.xml                      |  30 +++++++++++++++++++++++-------
 Instrument/AMDA/Cluster-Tango/STAFF.xml                      |  29 ++++++++++++++++++++++-------
 NumericalData/AMDA/ACE/MFI/ace-mag-real.xml                  |   2 +-
 NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml            |   2 +-
 NumericalData/AMDA/Cluster/Cluster1/STAFF/clust1-sta-pp.xml  |  90 ++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 NumericalData/AMDA/Cluster/Cluster2/STAFF/clust2-sta-pp.xml  | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------
 NumericalData/AMDA/Cluster/Cluster3/STAFF/clust3-sta-pp.xml  | 100 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 NumericalData/AMDA/Cluster/Cluster4/STAFF/clust4-sta-pp.xml  | 100 ++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 NumericalData/AMDA/Indices/Ground_Based/ground-based-dst.xml |   2 +-
 NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml                 |   2 +-
 NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml     |   2 +-
 NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml                 |   2 +-
 NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml            |   2 +-
 NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml            |   2 +-
 NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml       |   2 +-
 NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml      |   2 +-
 18 files changed, 277 insertions(+), 266 deletions(-)

diff --git a/Instrument/AMDA/Cluster-Rumba/STAFF.xml b/Instrument/AMDA/Cluster-Rumba/STAFF.xml
index 53eeb47..5fe6403 100644
--- a/Instrument/AMDA/Cluster-Rumba/STAFF.xml
+++ b/Instrument/AMDA/Cluster-Rumba/STAFF.xml
@@ -5,22 +5,37 @@
     <ResourceID>spase://CDPP/Instrument/AMDA/Cluster-Rumba/STAFF</ResourceID>
     <ResourceHeader>
       <ResourceName>STAFF</ResourceName>
-      <AlternateName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF)</AlternateName>
-      <ReleaseDate>2011-02-04T15:37:47Z</ReleaseDate>
-      <Description>This experiment (STAFF: Spatio-Temporal Analysis of Field Fluctuations) is one of the five complementary experiments which form the Wave Experiment Consortium (WEC) on Cluster. STAFF consists of: (1) a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, (2) a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis. Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz. Further, the secondary winding is used as a calibration loop to which an external AC signal is applied. In normal bit rate the wave-form data cover the 0.1--10 Hz frequency range, and the spectrum analyzer covers the range 8 Hz to 4 KHz. In high bit rate, the wave-form data cover 0.1--180 Hz and the spectrum analyzer covers 64 Hz to 4 KHz, using only the two highest frequency bands. In the base mode in normal bit rate the auto-spectra are averaged over 1 s, and the complete 25-component matrix is averaged over 4 s for five components. In high bit rate, only the two highest frequency bands are analyzed. In the fast modes, time resolution is 1 s for the cross-spectra, and either 0.125 s or 0.25 s for the auto-spectra. Other modes are also defined. The analysis will also use electric field waveform data from the EFW (part of WEC), and the hardware of the two instruments was designed to optimize correlation: low-pass filters are identical, sampling frequency is the same, and there is a synchronization signal for simultaneous sampling. The output signals of the STAFF magnetic preamplifiers are also sent to two other instruments: the WBD (part of WEC) and the EDI. Some of the magnetospheric structures to be studied are of small scale, and where the signature duration is of the order 1 s or less, the STAFF search coil data are complementary to those of the fluxgate magnetometer (FGM). For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment for the Cluster Mission'', by N. Cornilleau-Wehrlin et al., from which this information was obtained.</Description>
+      <AlternateName>Spatio-Temporal Analysis of Magnetic Field Fluctuations</AlternateName>
+      <ReleaseDate>2016-11-04T15:37:47Z</ReleaseDate>
+      <Description>STAFF is one of the five complementary experiments which form the Wave Experiment Consortium on Cluster. STAFF consists of:
+        * a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, 
+        * a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. 
+        
+        The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis.
+        Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz.</Description>
+      <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
       <Contact>
-        <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+        <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
+        <Name>ESA web page</Name>
+        <URL>http://sci.esa.int/jump.cfm?oid=33024</URL>
+        <Description>STAFF</Description>
+      </InformationURL> 
+      <InformationURL>
         <Name>NSSDC's Master Catalog</Name>
         <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&amp;ex=9</URL>
-        <Description>Information about the Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment on the Cluster 2/FM5 (Rumba) mission.</Description>
+        <Description>Information about STAFF experiment on the Cluster 2/FM5 (Rumba) mission.</Description>
       </InformationURL>
       <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/STAFF</PriorID>
     </ResourceHeader>
-    <InstrumentType>Magnetometer</InstrumentType>
-    <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM5 (Rumba)</InvestigationName>
+    <InstrumentType>SearchCoil</InstrumentType>
+    <InvestigationName></InvestigationName>
+     <OperatingSpan>
+      <StartDate>2000-12-01T00:00:00</StartDate>
+      <Note>Start of full orbit coverage: 2002-06-01T00:00:00</Note>
+    </OperatingSpan>
     <ObservatoryID>spase://CDPP/Observatory/AMDA/Cluster-Rumba</ObservatoryID>
   </Instrument>
 </Spase>
diff --git a/Instrument/AMDA/Cluster-Salsa/STAFF.xml b/Instrument/AMDA/Cluster-Salsa/STAFF.xml
index 90ae59f..66f1808 100644
--- a/Instrument/AMDA/Cluster-Salsa/STAFF.xml
+++ b/Instrument/AMDA/Cluster-Salsa/STAFF.xml
@@ -6,21 +6,36 @@
     <ResourceHeader>
       <ResourceName>STAFF</ResourceName>
       <AlternateName>Spatio-Temporal Analysis of Magnetic Field Fluctuations</AlternateName>
-      <ReleaseDate>2011-02-04T15:37:33Z</ReleaseDate>
-      <Description>This experiment (STAFF: Spatio-Temporal Analysis of Field Fluctuations) is one of the five complementary experiments which form the Wave Experiment Consortium (WEC) on Cluster. STAFF consists of: (1) a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, (2) a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis. Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz. Further, the secondary winding is used as a calibration loop to which an external AC signal is applied. In normal bit rate the wave-form data cover the 0.1--10 Hz frequency range, and the spectrum analyzer covers the range 8 Hz to 4 KHz. In high bit rate, the wave-form data cover 0.1--180 Hz and the spectrum analyzer covers 64 Hz to 4 KHz, using only the two highest frequency bands. In the base mode in normal bit rate the auto-spectra are averaged over 1 s, and the complete 25-component matrix is averaged over 4 s for five components. In high bit rate, only the two highest frequency bands are analyzed. In the fast modes, time resolution is 1 s for the cross-spectra, and either 0.125 s or 0.25 s for the auto-spectra. Other modes are also defined. The analysis will also use electric field waveform data from the EFW (part of WEC), and the hardware of the two instruments was designed to optimize correlation: low-pass filters are identical, sampling frequency is the same, and there is a synchronization signal for simultaneous sampling. The output signals of the STAFF magnetic preamplifiers are also sent to two other instruments: the WBD (part of WEC) and the EDI. Some of the magnetospheric structures to be studied are of small scale, and where the signature duration is of the order 1 s or less, the STAFF search coil data are complementary to those of the fluxgate magnetometer (FGM). For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment for the Cluster Mission'', by N. Cornilleau-Wehrlin et al., from which this information was obtained.</Description>
+      <ReleaseDate>2016-11-04T15:37:47Z</ReleaseDate>
+      <Description>STAFF is one of the five complementary experiments which form the Wave Experiment Consortium on Cluster. STAFF consists of:
+        * a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, 
+        * a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. 
+        
+        The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis.
+        Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz.</Description>
+      <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
       <Contact>
-        <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+        <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
+        <Name>ESA web page</Name>
+        <URL>http://sci.esa.int/jump.cfm?oid=33024</URL>
+        <Description>STAFF</Description>
+      </InformationURL> 
+      <InformationURL>
         <Name>NSSDC's Master Catalog</Name>
-        <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-041B&amp;ex=9</URL>
-        <Description>Information about the Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment on the Cluster 2/FM6 (Salsa) mission.</Description>
+        <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&amp;ex=9</URL>
+        <Description>Information about STAFF experiment on the Cluster 2/FM6 (Salsa) mission.</Description>
       </InformationURL>
       <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/STAFF</PriorID>
     </ResourceHeader>
-    <InstrumentType>Magnetometer</InstrumentType>
-    <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM6 (Salsa)</InvestigationName>
+    <InstrumentType>SearchCoil</InstrumentType>
+    <InvestigationName></InvestigationName>
+     <OperatingSpan>
+      <StartDate>2000-12-01T00:00:00</StartDate>
+      <Note>Start of full orbit coverage: 2002-06-01T00:00:00</Note>
+    </OperatingSpan>
     <ObservatoryID>spase://CDPP/Observatory/AMDA/Cluster-Salsa</ObservatoryID>
   </Instrument>
 </Spase>
diff --git a/Instrument/AMDA/Cluster-Samba/STAFF.xml b/Instrument/AMDA/Cluster-Samba/STAFF.xml
index 9f58c2d..b3024ca 100644
--- a/Instrument/AMDA/Cluster-Samba/STAFF.xml
+++ b/Instrument/AMDA/Cluster-Samba/STAFF.xml
@@ -6,21 +6,37 @@
     <ResourceHeader>
       <ResourceName>STAFF</ResourceName>
       <AlternateName>Spatio-Temporal Analysis of Magnetic Field Fluctuations</AlternateName>
-      <ReleaseDate>2011-02-04T15:37:07Z</ReleaseDate>
-      <Description>This experiment (STAFF: Spatio-Temporal Analysis of Field Fluctuations) is one of the five complementary experiments which form the Wave Experiment Consortium (WEC) on Cluster. STAFF consists of: (1) a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, (2) a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis. Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz. Further, the secondary winding is used as a calibration loop to which an external AC signal is applied. In normal bit rate the wave-form data cover the 0.1--10 Hz frequency range, and the spectrum analyzer covers the range 8 Hz to 4 KHz. In high bit rate, the wave-form data cover 0.1--180 Hz and the spectrum analyzer covers 64 Hz to 4 KHz, using only the two highest frequency bands. In the base mode in normal bit rate the auto-spectra are averaged over 1 s, and the complete 25-component matrix is averaged over 4 s for five components. In high bit rate, only the two highest frequency bands are analyzed. In the fast modes, time resolution is 1 s for the cross-spectra, and either 0.125 s or 0.25 s for the auto-spectra. Other modes are also defined. The analysis will also use electric field waveform data from the EFW (part of WEC), and the hardware of the two instruments was designed to optimize correlation: low-pass filters are identical, sampling frequency is the same, and there is a synchronization signal for simultaneous sampling. The output signals of the STAFF magnetic preamplifiers are also sent to two other instruments: the WBD (part of WEC) and the EDI. Some of the magnetospheric structures to be studied are of small scale, and where the signature duration is of the order 1 s or less, the STAFF search coil data are complementary to those of the fluxgate magnetometer (FGM). For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment for the Cluster Mission'', by N. Cornilleau-Wehrlin et al., from which this information was obtained.</Description>
+      <ReleaseDate>2016-11-04T15:37:47Z</ReleaseDate>
+      <Description>STAFF is one of the five complementary experiments which form the Wave Experiment Consortium on Cluster. STAFF consists of:
+        * a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, 
+        * a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. 
+        
+        The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis.
+        Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz.</Description>
+      <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
       <Contact>
-        <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+        <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
+        <Name>ESA web page</Name>
+        <URL>http://sci.esa.int/jump.cfm?oid=33024</URL>
+        <Description>STAFF</Description>
+      </InformationURL> 
+      <InformationURL>
         <Name>NSSDC's Master Catalog</Name>
-        <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-041A&amp;ex=9</URL>
-        <Description>Information about the Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment on the Cluster 2/FM7 (Samba) mission.</Description>
+        <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&amp;ex=9</URL>
+        <Description>Information about STAFF experiment on the Cluster 2/FM7 (Samba) mission.</Description>
       </InformationURL>
       <PriorID>spase://SMWG/Instrument/Cluster2-Samba/STAFF</PriorID>
     </ResourceHeader>
-    <InstrumentType>Magnetometer</InstrumentType>
-    <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM7 (Samba)</InvestigationName>
+    <InstrumentType>SearchCoil</InstrumentType>
+    <InvestigationName></InvestigationName>
+     <OperatingSpan>
+      <StartDate>2000-12-01T00:00:00</StartDate>
+      <Note>Start of full orbit coverage: 2002-06-01T00:00:00</Note>
+      <Note>C3 spacecraft tilt by 40° during one month: 2008-05-01T00:00:00</Note> 
+    </OperatingSpan>
     <ObservatoryID>spase://CDPP/Observatory/AMDA/Cluster-Samba</ObservatoryID>
   </Instrument>
 </Spase>
diff --git a/Instrument/AMDA/Cluster-Tango/STAFF.xml b/Instrument/AMDA/Cluster-Tango/STAFF.xml
index 10c9c1c..e950c78 100644
--- a/Instrument/AMDA/Cluster-Tango/STAFF.xml
+++ b/Instrument/AMDA/Cluster-Tango/STAFF.xml
@@ -6,21 +6,36 @@
     <ResourceHeader>
       <ResourceName>STAFF</ResourceName>
       <AlternateName>Spatio-Temporal Analysis of Magnetic Field Fluctuations</AlternateName>
-      <ReleaseDate>2011-02-04T15:37:19Z</ReleaseDate>
-      <Description>This experiment (STAFF: Spatio-Temporal Analysis of Field Fluctuations) is one of the five complementary experiments which form the Wave Experiment Consortium (WEC) on Cluster. STAFF consists of: (1) a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, (2) a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis. Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz. Further, the secondary winding is used as a calibration loop to which an external AC signal is applied. In normal bit rate the wave-form data cover the 0.1--10 Hz frequency range, and the spectrum analyzer covers the range 8 Hz to 4 KHz. In high bit rate, the wave-form data cover 0.1--180 Hz and the spectrum analyzer covers 64 Hz to 4 KHz, using only the two highest frequency bands. In the base mode in normal bit rate the auto-spectra are averaged over 1 s, and the complete 25-component matrix is averaged over 4 s for five components. In high bit rate, only the two highest frequency bands are analyzed. In the fast modes, time resolution is 1 s for the cross-spectra, and either 0.125 s or 0.25 s for the auto-spectra. Other modes are also defined. The analysis will also use electric field waveform data from the EFW (part of WEC), and the hardware of the two instruments was designed to optimize correlation: low-pass filters are identical, sampling frequency is the same, and there is a synchronization signal for simultaneous sampling. The output signals of the STAFF magnetic preamplifiers are also sent to two other instruments: the WBD (part of WEC) and the EDI. Some of the magnetospheric structures to be studied are of small scale, and where the signature duration is of the order 1 s or less, the STAFF search coil data are complementary to those of the fluxgate magnetometer (FGM). For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment for the Cluster Mission'', by N. Cornilleau-Wehrlin et al., from which this information was obtained.</Description>
+      <ReleaseDate>2016-11-04T15:37:47Z</ReleaseDate>
+      <Description>STAFF is one of the five complementary experiments which form the Wave Experiment Consortium on Cluster. STAFF consists of:
+        * a triaxial boom-mounted search-coil magnetometer to measure the magnetic components of electromagnetic fluctuations (up to 4 KHz); and, 
+        * a spectrum analyzer to compute the 25 auto- and cross-correlation coefficients of the spectral matrix, using three magnetic and two electric components of the waves. 
+        
+        The magnetic waveform (up to either 10 Hz or 180 Hz) is also transmitted. The Z-axis sensor is parallel to the spacecraft spin axis.
+        Each sensor consists of a high-permeability core embedded inside two solenoids. The frequency response of the main winding is flattened by a secondary winding through a flux feedback effect, in the range 40--4000 Hz.</Description>
+      <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
       <Contact>
-        <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+        <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
+        <Name>ESA web page</Name>
+        <URL>http://sci.esa.int/jump.cfm?oid=33024</URL>
+        <Description>STAFF</Description>
+      </InformationURL> 
+      <InformationURL>
         <Name>NSSDC's Master Catalog</Name>
-        <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045B&amp;ex=9</URL>
-        <Description>Information about the Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment on the Cluster 2/FM8 (Tango) mission.</Description>
+        <URL>http://nssdc.gsfc.nasa.gov/database/MasterCatalog?sc=2000-045A&amp;ex=9</URL>
+        <Description>Information about STAFF experiment on the Cluster 2/FM8 (Tango) mission.</Description>
       </InformationURL>
       <PriorID>spase://SMWG/Instrument/Cluster2-Tango/STAFF</PriorID>
     </ResourceHeader>
-    <InstrumentType>Magnetometer</InstrumentType>
-    <InvestigationName>Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) on Cluster 2/FM8 (Tango)</InvestigationName>
+    <InstrumentType>SearchCoil</InstrumentType>
+    <InvestigationName></InvestigationName>
+     <OperatingSpan>
+      <StartDate>2000-12-01T00:00:00</StartDate>
+      <Note>Start of full orbit coverage: 2002-06-01T00:00:00</Note>
+    </OperatingSpan>
     <ObservatoryID>spase://CDPP/Observatory/AMDA/Cluster-Tango</ObservatoryID>
   </Instrument>
 </Spase>
diff --git a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
index 4907dea..2b25cb8 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
@@ -51,7 +51,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-01-06T00:00:00Z</StartDate>
-             <StopDate>2016-11-10T00:59:59Z</StopDate>
+             <StopDate>2016-11-21T00:59:59Z</StopDate>
          </TimeSpan>
          <Cadence>PT60S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
index ce15b5b..24edbbb 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
@@ -44,7 +44,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>2014-01-06T00:00:00Z</StartDate>
-         <StopDate>2016-11-10T00:59:59Z</StopDate>
+         <StopDate>2016-11-21T00:59:59Z</StopDate>
      </TimeSpan>
      <Cadence>PT60S</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/Cluster/Cluster1/STAFF/clust1-sta-pp.xml b/NumericalData/AMDA/Cluster/Cluster1/STAFF/clust1-sta-pp.xml
index 0d3577d..39a3d60 100644
--- a/NumericalData/AMDA/Cluster/Cluster1/STAFF/clust1-sta-pp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster1/STAFF/clust1-sta-pp.xml
@@ -7,28 +7,29 @@
             <ResourceName>prime parameters</ResourceName>
             <AlternateName>Cluster 1 Prime Parameter STAFF Data</AlternateName>
             <ReleaseDate>2015-10-19T16:14:44Z</ReleaseDate>
-            <Description>The Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment provides
-                magnetic field power spectral density values parallel and perpendicular to the magnetic field and
-                the electric field power spectral density values for several frequency ranges. 
-                For more details of the Cluster mission, the spacecraft, and its instruments, see the report
-                Cluster: mission, payload and supporting activities, March 1993, ESA SP-1159, 
-                and the included article The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment 
-                for the Cluster Mission, by N. Cornilleau-Wehrlin et al., from which this information was obtained.
+            <Description>
+                The STAFF Spectrum Analyser (SA) combines the 3 magnetic components of the waves with the two electric components measured by the EFW experiment to calculate in real time the 5x5 Hermitian cross-spectral matrix at 27 frequencies distributed logarithmically in the frequency range 8 Hz to 4 kHz. 
+The components in the spin plane are despun onboard. The five auto-spectral power estimates are obtained with a dynamic range of approximately 100 dB and an average amplitude resolution of 0.38 dB.
+The 10 cross-spectral power estimates are normalised to give the coherence. The precision of the phase depends upon the magnitude of the coherence: for a signal with magnitude in the highest bin, it is approximately 5 degree close to 0 degree, 180 degree, and +/- 90 degree, increasing to about 10 degree midway between these angles. 
+The Spectrum Analyser can work in different modes, in Burst Mode the analysis is performed in 
+the frequency range 64 Hz - 4 kHz.
+This dataset contains preliminary spin resolution measurements of the magnetic field spectral density and electric field spectral density from the STAFF Spectrum Analyser experiment on the Cluster C1 spacecraft.
+These data have been converted into Cluster Exchange Format from the orignal Cluster Science Data System Common Data Format (CDF) Prime Parameter files that were made available through the Cluster Science Data System.              
             </Description>
-            <Acknowledgement>ESA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+                <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
+              <InformationURL>
+                <Name>ESA web page</Name>
+                <URL>http://www.cosmos.esa.int/web/csa/documentation</URL>
+                <Description>This site contains STAFF data documentation</Description>
+            </InformationURL>            
             <InformationURL>
-                <Name>NSSDC Master Catalog listing for Cluster II Rumba Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF)</Name>
+                <Name>NSSDC Master Catalog listing for Cluster II Rumba STAFF</Name>
                 <URL>http://nssdc.gsfc.nasa.gov/nmc/experimentDisplay.do?id=2000-045A-09</URL>
-                <Description>This site provides information concerning the Cluster II Rumba Spatio-Temporal
-                    Analysis of Magnetic Field Fluctuations Instrument.</Description>
+                <Description>This site provides information concerning the Cluster STAFF Instrument.</Description>
             </InformationURL>    
         </ResourceHeader>
         <AccessInformation>
@@ -39,14 +40,10 @@
                 <Name>AMDA at CDPP</Name>
                 <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
-            <Format>NetCDF</Format>
-            <Acknowledgement>NASA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Format>NetCDF</Format>           
         </AccessInformation>
         <ProviderName>CSDS-CNES</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName>Cluster II Rumba Prime Parameter Spatio-Temporal Analysis of 
-            Magnetic Field Fluctuations (STAFF) Data</ProviderResourceName>
-        <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Rumba/STAFF</InstrumentID>
         <MeasurementType>ElectricField</MeasurementType>
         <MeasurementType>MagneticField</MeasurementType>
@@ -57,9 +54,9 @@
                 <StopDate>2012-12-31T23:59:48Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
-        </TemporalDescription>
-        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
+        </TemporalDescription>        
         <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
+        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Main</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Polar</ObservedRegion>
@@ -81,11 +78,9 @@
         <Keyword>magnetotail</Keyword>
         <Keyword>lobe</Keyword> 
          <Parameter>
-            <Name>Magnetic Field Spectral Density (1-10 Hz)</Name>
+            <Name>b spectral density (1-10 Hz)</Name>
             <ParameterKey>c1_sta_f1</ParameterKey>
-            <Description>Cluster II Rumba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster 
-                Fluxgate Magnetometer (FGM) in the 1-10 Hz (f1) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 1-10 Hz (f1) at spin time resolution (parallel and perp components) 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -97,7 +92,7 @@
              <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Density Parallel to Bo (1-10 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c1_sta_f1(0)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -109,7 +104,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Density Perpendicular to Bo (1-10 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c1_sta_f1(1)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -119,7 +114,7 @@
                         <ScaleMin>1.0000e-6</ScaleMin>
                         <ScaleMax>1</ScaleMax>
                     </RenderingHints>      
-                </Element>
+                </Element> 
             </Structure>
             <FillValue>-1.0000e+31</FillValue>
             <Field>
@@ -134,11 +129,9 @@
         </Parameter>
         
         <Parameter>
-            <Name>Magnetic Field Spectral Density (10-180 Hz)</Name>
+            <Name>b spectral density (10-180 Hz)</Name>
             <ParameterKey>c1_sta_f2</ParameterKey>
-            <Description>Cluster II Rumba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 10-180 Hz (f2) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 10-180 Hz (f2) at spin time resolution (parallel and perp components)                 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -150,7 +143,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Density Parallel to Bo (10-180 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c1_sta_f2(0)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -162,7 +155,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Density Perpendicular to Bo (10-180 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c1_sta_f2(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -186,11 +179,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Magnetic Field Spectral Density (180-4000 Hz)</Name>
+            <Name>b spectral density (180-4000 Hz)</Name>
             <ParameterKey>c1_sta_f3</ParameterKey>
-            <Description>Cluster II Rumba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 180-4000 Hz (f3) frequency range at spin time resolution
+            <Description> Magnetic field spectral power in the 80-4000 Hz (f3) at spin time resolution (parallel and perp components)  
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -202,7 +193,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Density Parallel to Bo (180-4000 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c1_sta_f3(0)</ParameterKey>
                     <ValidMin>1.0000e-11</ValidMin>
@@ -214,7 +205,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Density Perpendicular to Bo (180-4000 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c1_sta_f3(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -236,14 +227,11 @@
                     <Units>Hz</Units>
                 </FrequencyRange>
             </Field>
-        </Parameter>
-    
+        </Parameter>   
         <Parameter>
-            <Name>Electric Field Spectral Density (10-180 Hz)</Name>
+            <Name>e spectral density (10-180 Hz)</Name>
             <ParameterKey>c1_stae_f2</ParameterKey>
-            <Description>Cluster II Rumba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 10-180 Hz (f2) 
-                frequency range at spin time resolution
+            <Description> Electric field spectral power in the 10-180 Hz (f2) frequency range at spin time resolution.
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -269,11 +257,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Electric Field Spectral Density (180-4000 Hz)</Name>
+            <Name>e spectral density (180-4000 Hz)</Name>
             <ParameterKey>c1_stae_f3</ParameterKey>
-            <Description>Cluster II Rumba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 180-4000 Hz (f3)
-                frequency range at spin time resolution
+            <Description>Electric field spectral power in the 180-4000 Hz (f3) frequency range at spin time resolution. 
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
diff --git a/NumericalData/AMDA/Cluster/Cluster2/STAFF/clust2-sta-pp.xml b/NumericalData/AMDA/Cluster/Cluster2/STAFF/clust2-sta-pp.xml
index aab4d7e..b70a0e1 100644
--- a/NumericalData/AMDA/Cluster/Cluster2/STAFF/clust2-sta-pp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster2/STAFF/clust2-sta-pp.xml
@@ -6,30 +6,31 @@
         <ResourceHeader>
             <ResourceName>prime parameters</ResourceName>
             <AlternateName>Cluster 2 Prime Parameter STAFF Data</AlternateName>
-            <ReleaseDate>2015-10-19T17:51:44Z</ReleaseDate>
-            <Description>The Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment provides
-                magnetic field power spectral density values parallel and perpendicular to the magnetic field and
-                the electric field power spectral density values for several frequency ranges. 
-                For more details of the Cluster mission, the spacecraft, and its instruments, see the report
-                Cluster: mission, payload and supporting activities, March 1993, ESA SP-1159, 
-                and the included article The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment 
-                for the Cluster Mission, by N. Cornilleau-Wehrlin et al., from which this information was obtained.
+            <ReleaseDate>2015-10-19T16:14:44Z</ReleaseDate>
+            <Description>
+                The STAFF Spectrum Analyser (SA) combines the 3 magnetic components of the waves with the two electric components measured by the EFW experiment to calculate in real time the 5x5 Hermitian cross-spectral matrix at 27 frequencies distributed logarithmically in the frequency range 8 Hz to 4 kHz. 
+The components in the spin plane are despun onboard. The five auto-spectral power estimates are obtained with a dynamic range of approximately 100 dB and an average amplitude resolution of 0.38 dB.
+The 10 cross-spectral power estimates are normalised to give the coherence. The precision of the phase depends upon the magnitude of the coherence: for a signal with magnitude in the highest bin, it is approximately 5 degree close to 0 degree, 180 degree, and +/- 90 degree, increasing to about 10 degree midway between these angles. 
+The Spectrum Analyser can work in different modes, in Burst Mode the analysis is performed in 
+the frequency range 64 Hz - 4 kHz.
+This dataset contains preliminary spin resolution measurements of the magnetic field spectral density and electric field spectral density from the STAFF Spectrum Analyser experiment on the Cluster C1 spacecraft.
+These data have been converted into Cluster Exchange Format from the orignal Cluster Science Data System Common Data Format (CDF) Prime Parameter files that were made available through the Cluster Science Data System.              
             </Description>
-            <Acknowledgement>ESA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+                <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
+              <InformationURL>
+                <Name>ESA web page</Name>
+                <URL>http://www.cosmos.esa.int/web/csa/documentation</URL>
+                <Description>This site contains STAFF data documentation</Description>
+            </InformationURL>            
             <InformationURL>
-                <Name>NSSDC Master Catalog listing for Cluster II Salsa Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF)</Name>
+                <Name>NSSDC Master Catalog listing for Cluster II Samba STAFF</Name>
                 <URL>http://nssdc.gsfc.nasa.gov/nmc/experimentDisplay.do?id=2000-045A-09</URL>
-                <Description>This site provides information concerning the Cluster II Salsa Spatio-Temporal
-                    Analysis of Magnetic Field Fluctuations Instrument.</Description>
-            </InformationURL>
+                <Description>This site provides information concerning the Cluster STAFF Instrument.</Description>
+            </InformationURL>    
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -39,15 +40,11 @@
                 <Name>AMDA at CDPP</Name>
                 <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
-            <Format>NetCDF</Format>
-            <Acknowledgement>NASA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Format>NetCDF</Format>           
         </AccessInformation>
         <ProviderName>CSDS-CNES</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName>Cluster II Salsa Prime Parameter Spatio-Temporal Analysis of 
-            Magnetic Field Fluctuations (STAFF) Data</ProviderResourceName>
-        <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
-        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Salsa/STAFF</InstrumentID>
+        <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Rumba/STAFF</InstrumentID>
         <MeasurementType>ElectricField</MeasurementType>
         <MeasurementType>MagneticField</MeasurementType>
         <MeasurementType>Waves.Passive</MeasurementType>
@@ -57,9 +54,9 @@
                 <StopDate>2012-12-31T23:59:46Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
-        </TemporalDescription>
-        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
+        </TemporalDescription>        
         <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
+        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Main</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Polar</ObservedRegion>
@@ -79,25 +76,23 @@
         <Keyword>magnetosheath</Keyword>
         <Keyword>Cluster</Keyword>
         <Keyword>magnetotail</Keyword>
-        <Keyword>lobe</Keyword>
-        <Parameter>
-            <Name>Magnetic Field Spectral Power (1-10 Hz)</Name>
+        <Keyword>lobe</Keyword> 
+         <Parameter>
+            <Name>b spectral density (1-10 Hz)</Name>
             <ParameterKey>c2_sta_f1</ParameterKey>
-            <Description>Cluster II Salsa Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster 
-                Fluxgate Magnetometer (FGM) in the 1-10 Hz (f1) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 1-10 Hz (f1) at spin time resolution (parallel and perp components) 
             </Description>
-             <Ucd>phys.flux.density;phys.magField</Ucd>
-             <Cadence>PT4S</Cadence>
-             <Units>nT^2 Hz^-1</Units>
-             <UnitsConversion>1.0e-18&gt;T^2 Hz^-1</UnitsConversion>
-             <RenderingHints>
-                 <DisplayType>TimeSeries</DisplayType>
-             </RenderingHints>
-            <Structure>
+            <Ucd>phys.flux.density;phys.magField</Ucd>
+            <Cadence>PT4S</Cadence>
+            <Units>nT^2 Hz^-1</Units>
+            <UnitsConversion>1.0e-18&gt;T^2 Hz^-1</UnitsConversion>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (1-10 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c2_sta_f1(0)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -109,7 +104,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (1-10 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c2_sta_f1(1)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -119,7 +114,7 @@
                         <ScaleMin>1.0000e-6</ScaleMin>
                         <ScaleMax>1</ScaleMax>
                     </RenderingHints>      
-                </Element>
+                </Element> 
             </Structure>
             <FillValue>-1.0000e+31</FillValue>
             <Field>
@@ -132,12 +127,11 @@
                 </FrequencyRange>
             </Field>
         </Parameter>
+        
         <Parameter>
-            <Name>Magnetic Field Spectral Power (10-180 Hz)</Name>
+            <Name>b spectral density (10-180 Hz)</Name>
             <ParameterKey>c2_sta_f2</ParameterKey>
-            <Description>Cluster II Salsa Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 10-180 Hz (f2) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 10-180 Hz (f2) at spin time resolution (parallel and perp components)                 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -149,7 +143,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (10-180 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c2_sta_f2(0)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -161,7 +155,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (10-180 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c2_sta_f2(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -185,11 +179,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Magnetic Field Spectral Power (180-4000 Hz)</Name>
+            <Name>b spectral density (180-4000 Hz)</Name>
             <ParameterKey>c2_sta_f3</ParameterKey>
-            <Description>Cluster II Salsa Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 180-4000 Hz (f3) frequency range at spin time resolution
+            <Description> Magnetic field spectral power in the 80-4000 Hz (f3) at spin time resolution (parallel and perp components)  
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -201,7 +193,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (180-4000 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c2_sta_f3(0)</ParameterKey>
                     <ValidMin>1.0000e-11</ValidMin>
@@ -213,7 +205,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (180-4000 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c2_sta_f3(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -235,13 +227,11 @@
                     <Units>Hz</Units>
                 </FrequencyRange>
             </Field>
-        </Parameter>
+        </Parameter>   
         <Parameter>
-            <Name>Electric Field Spectral Power (10-180 Hz)</Name>
+            <Name>e spectral density (10-180 Hz)</Name>
             <ParameterKey>c2_stae_f2</ParameterKey>
-            <Description>Cluster II Salsa Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 10-180 Hz (f2) 
-                frequency range at spin time resolution
+            <Description> Electric field spectral power in the 10-180 Hz (f2) frequency range at spin time resolution.
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -267,11 +257,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Electric Field Spectral Power (180-4000 Hz)</Name>
+            <Name>e spectral density (180-4000 Hz)</Name>
             <ParameterKey>c2_stae_f3</ParameterKey>
-            <Description>Cluster II Salsa Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 180-4000 Hz (f3)
-                frequency range at spin time resolution
+            <Description>Electric field spectral power in the 180-4000 Hz (f3) frequency range at spin time resolution. 
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
diff --git a/NumericalData/AMDA/Cluster/Cluster3/STAFF/clust3-sta-pp.xml b/NumericalData/AMDA/Cluster/Cluster3/STAFF/clust3-sta-pp.xml
index f6ab45f..2dba26a 100644
--- a/NumericalData/AMDA/Cluster/Cluster3/STAFF/clust3-sta-pp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster3/STAFF/clust3-sta-pp.xml
@@ -6,30 +6,31 @@
         <ResourceHeader>
             <ResourceName>prime parameters</ResourceName>
             <AlternateName>Cluster 3 Prime Parameter STAFF Data</AlternateName>
-            <ReleaseDate>2015-10-19T15:51:44Z</ReleaseDate>
-            <Description>The Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment provides
-                magnetic field power spectral density values parallel and perpendicular to the magnetic field and
-                the electric field power spectral density values for several frequency ranges. 
-                For more details of the Cluster mission, the spacecraft, and its instruments, see the report
-                Cluster: mission, payload and supporting activities, March 1993, ESA SP-1159, 
-                and the included article The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment 
-                for the Cluster Mission, by N. Cornilleau-Wehrlin et al., from which this information was obtained.
+            <ReleaseDate>2015-10-19T16:14:44Z</ReleaseDate>
+            <Description>
+                The STAFF Spectrum Analyser (SA) combines the 3 magnetic components of the waves with the two electric components measured by the EFW experiment to calculate in real time the 5x5 Hermitian cross-spectral matrix at 27 frequencies distributed logarithmically in the frequency range 8 Hz to 4 kHz. 
+The components in the spin plane are despun onboard. The five auto-spectral power estimates are obtained with a dynamic range of approximately 100 dB and an average amplitude resolution of 0.38 dB.
+The 10 cross-spectral power estimates are normalised to give the coherence. The precision of the phase depends upon the magnitude of the coherence: for a signal with magnitude in the highest bin, it is approximately 5 degree close to 0 degree, 180 degree, and +/- 90 degree, increasing to about 10 degree midway between these angles. 
+The Spectrum Analyser can work in different modes, in Burst Mode the analysis is performed in 
+the frequency range 64 Hz - 4 kHz.
+This dataset contains preliminary spin resolution measurements of the magnetic field spectral density and electric field spectral density from the STAFF Spectrum Analyser experiment on the Cluster C1 spacecraft.
+These data have been converted into Cluster Exchange Format from the orignal Cluster Science Data System Common Data Format (CDF) Prime Parameter files that were made available through the Cluster Science Data System.              
             </Description>
-            <Acknowledgement>ESA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+                <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
+              <InformationURL>
+                <Name>ESA web page</Name>
+                <URL>http://www.cosmos.esa.int/web/csa/documentation</URL>
+                <Description>This site contains STAFF data documentation</Description>
+            </InformationURL>            
             <InformationURL>
-                <Name>NSSDC Master Catalog listing for Cluster II Samba Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF)</Name>
+                <Name>NSSDC Master Catalog listing for Cluster II Samba STAFF</Name>
                 <URL>http://nssdc.gsfc.nasa.gov/nmc/experimentDisplay.do?id=2000-045A-09</URL>
-                <Description>This site provides information concerning the Cluster II Samba Spatio-Temporal
-                    Analysis of Magnetic Field Fluctuations Instrument.</Description>
-            </InformationURL>
+                <Description>This site provides information concerning the Cluster STAFF Instrument.</Description>
+            </InformationURL>    
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -39,14 +40,10 @@
                 <Name>AMDA at CDPP</Name>
                 <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
-            <Format>NetCDF</Format>
-            <Acknowledgement>NASA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Format>NetCDF</Format>           
         </AccessInformation>
         <ProviderName>CSDS-CNES</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName>Cluster II Samba Prime Parameter Spatio-Temporal Analysis of 
-            Magnetic Field Fluctuations (STAFF) Data</ProviderResourceName>
-        <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Samba/STAFF</InstrumentID>
         <MeasurementType>ElectricField</MeasurementType>
         <MeasurementType>MagneticField</MeasurementType>
@@ -57,9 +54,9 @@
                 <StopDate>2012-12-31T23:59:47Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
-        </TemporalDescription>
-        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
+        </TemporalDescription>        
         <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
+        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Main</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Polar</ObservedRegion>
@@ -79,13 +76,11 @@
         <Keyword>magnetosheath</Keyword>
         <Keyword>Cluster</Keyword>
         <Keyword>magnetotail</Keyword>
-        <Keyword>lobe</Keyword>
-        <Parameter>
-            <Name>Magnetic Field Spectral Power (1-10 Hz)</Name>
+        <Keyword>lobe</Keyword> 
+         <Parameter>
+            <Name>b spectral density (1-10 Hz)</Name>
             <ParameterKey>c3_sta_f1</ParameterKey>
-            <Description>Cluster II Samba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster 
-                Fluxgate Magnetometer (FGM) in the 1-10 Hz (f1) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 1-10 Hz (f1) at spin time resolution (parallel and perp components) 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -94,10 +89,10 @@
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
-            <Structure>
+             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (1-10 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c3_sta_f1(0)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -109,7 +104,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (1-10 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c3_sta_f1(1)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -119,7 +114,7 @@
                         <ScaleMin>1.0000e-6</ScaleMin>
                         <ScaleMax>1</ScaleMax>
                     </RenderingHints>      
-                </Element>
+                </Element> 
             </Structure>
             <FillValue>-1.0000e+31</FillValue>
             <Field>
@@ -132,12 +127,11 @@
                 </FrequencyRange>
             </Field>
         </Parameter>
+        
         <Parameter>
-            <Name>Magnetic Field Spectral Power (10-180 Hz)</Name>
+            <Name>b spectral density (10-180 Hz)</Name>
             <ParameterKey>c3_sta_f2</ParameterKey>
-            <Description>Cluster II Samba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 10-180 Hz (f2) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 10-180 Hz (f2) at spin time resolution (parallel and perp components)                 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -149,7 +143,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (10-180 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c3_sta_f2(0)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -161,7 +155,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (10-180 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c3_sta_f2(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -185,11 +179,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Magnetic Field Spectral Power (180-4000 Hz)</Name>
+            <Name>b spectral density (180-4000 Hz)</Name>
             <ParameterKey>c3_sta_f3</ParameterKey>
-            <Description>Cluster II Samba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 180-4000 Hz (f3) frequency range at spin time resolution
+            <Description> Magnetic field spectral power in the 80-4000 Hz (f3) at spin time resolution (parallel and perp components)  
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -201,7 +193,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (180-4000 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c3_sta_f3(0)</ParameterKey>
                     <ValidMin>1.0000e-11</ValidMin>
@@ -213,7 +205,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (180-4000 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c3_sta_f3(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -235,13 +227,11 @@
                     <Units>Hz</Units>
                 </FrequencyRange>
             </Field>
-        </Parameter>
+        </Parameter>   
         <Parameter>
-            <Name>Electric Field Spectral Power (10-180 Hz)</Name>
+            <Name>e spectral density (10-180 Hz)</Name>
             <ParameterKey>c3_stae_f2</ParameterKey>
-            <Description>Cluster II Samba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 10-180 Hz (f2) 
-                frequency range at spin time resolution
+            <Description> Electric field spectral power in the 10-180 Hz (f2) frequency range at spin time resolution.
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -267,11 +257,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Electric Field Spectral Power (180-4000 Hz)</Name>
+            <Name>e spectral density (180-4000 Hz)</Name>
             <ParameterKey>c3_stae_f3</ParameterKey>
-            <Description>Cluster II Samba Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 180-4000 Hz (f3)
-                frequency range at spin time resolution
+            <Description>Electric field spectral power in the 180-4000 Hz (f3) frequency range at spin time resolution. 
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
diff --git a/NumericalData/AMDA/Cluster/Cluster4/STAFF/clust4-sta-pp.xml b/NumericalData/AMDA/Cluster/Cluster4/STAFF/clust4-sta-pp.xml
index d06d373..6b13383 100644
--- a/NumericalData/AMDA/Cluster/Cluster4/STAFF/clust4-sta-pp.xml
+++ b/NumericalData/AMDA/Cluster/Cluster4/STAFF/clust4-sta-pp.xml
@@ -6,30 +6,31 @@
         <ResourceHeader>
             <ResourceName>prime parameters</ResourceName>
             <AlternateName>Cluster 4 Prime Parameter STAFF Data</AlternateName>
-            <ReleaseDate>2015-10-16T17:51:44Z</ReleaseDate>
-            <Description>The Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF) experiment provides
-                magnetic field power spectral density values parallel and perpendicular to the magnetic field and
-                the electric field power spectral density values for several frequency ranges. 
-                For more details of the Cluster mission, the spacecraft, and its instruments, see the report
-                Cluster: mission, payload and supporting activities, March 1993, ESA SP-1159, 
-                and the included article The STAFF (Spatio-Temporal Analysis of Field Fluctuations) Experiment 
-                for the Cluster Mission, by N. Cornilleau-Wehrlin et al., from which this information was obtained.
+            <ReleaseDate>2015-10-19T16:14:44Z</ReleaseDate>
+            <Description>
+                The STAFF Spectrum Analyser (SA) combines the 3 magnetic components of the waves with the two electric components measured by the EFW experiment to calculate in real time the 5x5 Hermitian cross-spectral matrix at 27 frequencies distributed logarithmically in the frequency range 8 Hz to 4 kHz. 
+The components in the spin plane are despun onboard. The five auto-spectral power estimates are obtained with a dynamic range of approximately 100 dB and an average amplitude resolution of 0.38 dB.
+The 10 cross-spectral power estimates are normalised to give the coherence. The precision of the phase depends upon the magnitude of the coherence: for a signal with magnitude in the highest bin, it is approximately 5 degree close to 0 degree, 180 degree, and +/- 90 degree, increasing to about 10 degree midway between these angles. 
+The Spectrum Analyser can work in different modes, in Burst Mode the analysis is performed in 
+the frequency range 64 Hz - 4 kHz.
+This dataset contains preliminary spin resolution measurements of the magnetic field spectral density and electric field spectral density from the STAFF Spectrum Analyser experiment on the Cluster C1 spacecraft.
+These data have been converted into Cluster Exchange Format from the orignal Cluster Science Data System Common Data Format (CDF) Prime Parameter files that were made available through the Cluster Science Data System.              
             </Description>
-            <Acknowledgement>ESA, Nicole Cornilleau-Wehrlin</Acknowledgement>
+            <Acknowledgement>Principal Investigator: Patrick Canu</Acknowledgement>
             <Contact>
-                <PersonID>spase://SMWG/Person/Nicole.Cornilleau-Wehrlin</PersonID>
+                <PersonID>spase://SMWG/Person/Patrick.Canu</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
-                <Role>TechnicalContact</Role>
-            </Contact>
+              <InformationURL>
+                <Name>ESA web page</Name>
+                <URL>http://www.cosmos.esa.int/web/csa/documentation</URL>
+                <Description>This site contains STAFF data documentation</Description>
+            </InformationURL>            
             <InformationURL>
-                <Name>NSSDC Master Catalog listing for Cluster II Tango Spatio-Temporal Analysis of Magnetic Field Fluctuations (STAFF)</Name>
+                <Name>NSSDC Master Catalog listing for Cluster II Tango STAFF</Name>
                 <URL>http://nssdc.gsfc.nasa.gov/nmc/experimentDisplay.do?id=2000-045A-09</URL>
-                <Description>This site provides information concerning the Cluster II Tango Spatio-Temporal
-                    Analysis of Magnetic Field Fluctuations Instrument.</Description>
-            </InformationURL>            
+                <Description>This site provides information concerning the Cluster STAFF Instrument.</Description>
+            </InformationURL>    
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -39,14 +40,10 @@
                 <Name>AMDA at CDPP</Name>
                 <URL>http://amda.cdpp.eu</URL>
             </AccessURL>
-            <Format>NetCDF</Format>
-            <Acknowledgement/>
+            <Format>NetCDF</Format>           
         </AccessInformation>
         <ProviderName>CSDS-CNES</ProviderName>
         <ProcessingLevel>Calibrated</ProcessingLevel>
-        <ProviderResourceName>Cluster II Tango Prime Parameter Spatio-Temporal Analysis of 
-            Magnetic Field Fluctuations (STAFF) Data</ProviderResourceName>
-        <ProviderProcessingLevel>Calibrated</ProviderProcessingLevel>
         <InstrumentID>spase://CDPP/Instrument/AMDA/Cluster-Tango/STAFF</InstrumentID>
         <MeasurementType>ElectricField</MeasurementType>
         <MeasurementType>MagneticField</MeasurementType>
@@ -57,9 +54,9 @@
                 <StopDate>2012-12-31T23:59:45Z</StopDate>
             </TimeSpan>
             <Cadence>PT4S</Cadence>
-        </TemporalDescription>
-        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
+        </TemporalDescription>        
         <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
+        <ObservedRegion>Earth.Magnetosheath</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Magnetotail</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Main</ObservedRegion>
         <ObservedRegion>Earth.Magnetosphere.Polar</ObservedRegion>
@@ -79,13 +76,11 @@
         <Keyword>magnetosheath</Keyword>
         <Keyword>Cluster</Keyword>
         <Keyword>magnetotail</Keyword>
-        <Keyword>lobe</Keyword>
-        <Parameter>
-            <Name>Magnetic Field Spectral Power (1-10 Hz)</Name>
+        <Keyword>lobe</Keyword> 
+         <Parameter>
+            <Name>b spectral density (1-10 Hz)</Name>
             <ParameterKey>c4_sta_f1</ParameterKey>
-            <Description>Cluster II Tango Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster 
-                Fluxgate Magnetometer (FGM) in the 1-10 Hz (f1) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 1-10 Hz (f1) at spin time resolution (parallel and perp components) 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -94,10 +89,10 @@
             <RenderingHints>
                 <DisplayType>TimeSeries</DisplayType>
             </RenderingHints>
-            <Structure>
+             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (1-10 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c4_sta_f1(0)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -109,7 +104,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (1-10 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c4_sta_f1(1)</ParameterKey>
                     <ValidMin>1.0000e-7</ValidMin>
@@ -119,7 +114,7 @@
                         <ScaleMin>1.0000e-6</ScaleMin>
                         <ScaleMax>1</ScaleMax>
                     </RenderingHints>      
-                </Element>
+                </Element> 
             </Structure>
             <FillValue>-1.0000e+31</FillValue>
             <Field>
@@ -132,12 +127,11 @@
                 </FrequencyRange>
             </Field>
         </Parameter>
+        
         <Parameter>
-            <Name>Magnetic Field Spectral Power (10-180 Hz)</Name>
+            <Name>b spectral density (10-180 Hz)</Name>
             <ParameterKey>c4_sta_f2</ParameterKey>
-            <Description>Cluster II Tango Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 10-180 Hz (f2) frequency range at spin time resolution
+            <Description>Magnetic field spectral power in the 10-180 Hz (f2) at spin time resolution (parallel and perp components)                 
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -149,7 +143,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (10-180 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c4_sta_f2(0)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -161,7 +155,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (10-180 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c4_sta_f2(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -185,11 +179,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Magnetic Field Spectral Power (180-4000 Hz)</Name>
+            <Name>b spectral density (180-4000 Hz)</Name>
             <ParameterKey>c4_sta_f3</ParameterKey>
-            <Description>Cluster II Tango Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) magnetic field spectral power as measured by the onboard Cluster
-                Fluxgate Magnetometer (FGM) in the 180-4000 Hz (f3) frequency range at spin time resolution
+            <Description> Magnetic field spectral power in the 80-4000 Hz (f3) at spin time resolution (parallel and perp components)  
             </Description>
             <Ucd>phys.flux.density;phys.magField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -201,7 +193,7 @@
             <Structure>
                 <Size>2</Size>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Parallel to Bo (180-4000 Hz)</Name>
+                    <Name>parallel to b0</Name>
                     <Index>1</Index>
                     <ParameterKey>c4_sta_f3(0)</ParameterKey>
                     <ValidMin>1.0000e-11</ValidMin>
@@ -213,7 +205,7 @@
                     </RenderingHints>                    
                 </Element>
                 <Element>
-                    <Name>Magnetic Field Spectral Power Perpendicular to Bo (180-4000 Hz)</Name>
+                    <Name>perpendicular to b0</Name>
                     <Index>2</Index>
                     <ParameterKey>c4_sta_f3(1)</ParameterKey>
                     <ValidMin>1.0000e-9</ValidMin>
@@ -235,13 +227,11 @@
                     <Units>Hz</Units>
                 </FrequencyRange>
             </Field>
-        </Parameter>
+        </Parameter>   
         <Parameter>
-            <Name>Electric Field Spectral Power (10-180 Hz)</Name>
+            <Name>e spectral density (10-180 Hz)</Name>
             <ParameterKey>c4_stae_f2</ParameterKey>
-            <Description>Cluster II Tango Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 10-180 Hz (f2) 
-                frequency range at spin time resolution
+            <Description> Electric field spectral power in the 10-180 Hz (f2) frequency range at spin time resolution.
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
@@ -267,11 +257,9 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>Electric Field Spectral Power (180-4000 Hz)</Name>
+            <Name>e spectral density (180-4000 Hz)</Name>
             <ParameterKey>c4_stae_f3</ParameterKey>
-            <Description>Cluster II Tango Prime Parameter Spatio-Temporal Analysis of Magnetic Field 
-                Fluctuations (STAFF) electric field spectral power in the 180-4000 Hz (f3)
-                frequency range at spin time resolution
+            <Description>Electric field spectral power in the 180-4000 Hz (f3) frequency range at spin time resolution. 
             </Description>
             <Ucd>phys.flux.density;phys.electField</Ucd>
             <Cadence>PT4S</Cadence>
diff --git a/NumericalData/AMDA/Indices/Ground_Based/ground-based-dst.xml b/NumericalData/AMDA/Indices/Ground_Based/ground-based-dst.xml
index ea57867..64a91e4 100644
--- a/NumericalData/AMDA/Indices/Ground_Based/ground-based-dst.xml
+++ b/NumericalData/AMDA/Indices/Ground_Based/ground-based-dst.xml
@@ -47,7 +47,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>1970-01-01T00:00:00Z</StartDate>
-             <StopDate>2016-05-31T23:59:59Z</StopDate>
+             <StopDate>2016-10-31T23:59:59Z</StopDate>
          </TimeSpan>
       <Cadence>PT1H</Cadence></TemporalDescription>
       <ObservedRegion>Earth.Magnetosphere.Main</ObservedRegion>
diff --git a/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml b/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml
index fac06c9..a5b5650 100644
--- a/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml
+++ b/NumericalData/AMDA/MAVEN/EUV/mvn-euv-clb.xml
@@ -45,7 +45,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-18T00:00:16Z</StartDate>
-             <StopDate>2016-05-15T00:00:00Z</StopDate>
+             <StopDate>2016-08-15T00:00:00Z</StopDate>
          </TimeSpan>
       <Cadence>PT60S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
index 903bde6..366b888 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
@@ -49,7 +49,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2014-06-01T00:00:00Z</StartDate>
-             <StopDate>2016-11-01T20:12:00Z</StopDate>
+             <StopDate>2016-11-08T19:42:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1M</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml b/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
index ad73559..ed0947d 100644
--- a/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
+++ b/NumericalData/AMDA/MAVEN/MAG/mav-mag-pds.xml
@@ -48,7 +48,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-10T00:00:00Z</StartDate>
-             <StopDate>2016-05-15T00:00:02Z</StopDate>
+             <StopDate>2016-05-19T00:00:01Z</StopDate>
          </TimeSpan>
         <Cadence>PT0.031S</Cadence>     
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
index 56b7a01..b0e9d24 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c0.xml
@@ -44,7 +44,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-13T00:00:20Z</StartDate>
-             <StopDate>2016-05-15T00:00:19Z</StopDate>
+             <StopDate>2016-08-15T00:00:06Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml
index 62b7d60..61b92ad 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mavpds-sta-c6.xml
@@ -47,7 +47,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-10-13T00:00:04Z</StartDate>
-             <StopDate>2016-05-15T00:00:03Z</StopDate>
+             <StopDate>2016-08-15T00:00:02Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
index 0162106..d908f1d 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
@@ -48,7 +48,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-03-19T14:19:43Z</StartDate>
-             <StopDate>2016-05-15T00:00:45Z</StopDate>
+             <StopDate>2016-08-15T00:01:00Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence></TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
index 1be383c..ccb1c40 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
@@ -45,7 +45,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-03-19T14:20:43Z</StartDate>
-             <StopDate>2016-05-15T00:00:37Z</StopDate>
+             <StopDate>2016-08-15T00:00:56Z</StopDate>
          </TimeSpan>
       <Cadence>PT4S</Cadence></TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
--
libgit2 0.21.2