From 4d1b18949945d1e58b408bfbd552ab45cd994a0a Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Fri, 23 Dec 2016 11:56:00 +0100
Subject: [PATCH] correct mav_swia/swea

---
 PARAM_DEF/mav_swea_svyspec.xml  | 40 ++++++++++++++++++----------------------
 PARAM_DEF/mav_swea_svyspecf.xml | 46 +++++++++++++++++++++-------------------------
 PARAM_DEF/mav_swia_cspec.xml    | 36 +++++++++++++++++++++++++++++++++---
 PARAM_DEF/mav_swia_fspec.xml    | 61 ++++++++++++++++++++++++++++++++++++++++++++++---------------
 4 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/PARAM_DEF/mav_swea_svyspec.xml b/PARAM_DEF/mav_swea_svyspec.xml
index 4464230..9388374 100644
--- a/PARAM_DEF/mav_swea_svyspec.xml
+++ b/PARAM_DEF/mav_swea_svyspec.xml
@@ -22,33 +22,29 @@
 					<spectro yAxis="y-left"/>
 				</param>
 			</params> 
-			<!--<axes><xAxis>
-                <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
-                  <range extend="true"/>
-                  <tick position="outwards" minorGrid="false" majorGrid="false"/>
-                  <legend/>
-                </timeAxis>
-              </xAxis>
-              <yAxis>
-                <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
-                  <range extend="true"/>
-                  <tick position="outwards" minorGrid="false" majorGrid="false"/>
-                  <legend/>
-                </digitalAxis>
-                <digitalAxis id="y-right" position="right" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
-                  <range extend="true"/>
-                  <tick position="outwards" minorGrid="false" majorGrid="false"/>
-                  <legend/>
-                </digitalAxis>
-              </yAxis>
+			<axes>
+				<xAxis>
+					<timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</timeAxis>
+				</xAxis>
+				<yAxis>
+					<digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</digitalAxis>                 
+				</yAxis>
 				<zAxis>
 					<colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
 						<range extend="true"/>
 						<tick position="outwards" minorGrid="false" majorGrid="false"/>
 					</colorAxis>
 				</zAxis>
-				</axes>-->
-		</timePlot>  
-	  </plot>
+			</axes> 
+	     </timePlot>  
+	   </plot>
 	</output>
 </param>
diff --git a/PARAM_DEF/mav_swea_svyspecf.xml b/PARAM_DEF/mav_swea_svyspecf.xml
index 1e042ce..8363d42 100644
--- a/PARAM_DEF/mav_swea_svyspecf.xml
+++ b/PARAM_DEF/mav_swea_svyspecf.xml
@@ -1,5 +1,5 @@
-fluxes<?xml version="1.0"?>
-<param xml:id="mav_swea_svyspecf">
+<?xml version="1.0"?>
+<param xml:id="mav_swea_svyspecf"> 
 	<info>
 		<table>
 			<boundsTable name="Energy" boundsName="EnergyBounds" units="eV"/>
@@ -9,7 +9,7 @@ fluxes<?xml version="1.0"?>
 	<get>
 		<vi name="mavpds:swea:svyspec">
 			<baseParam name="diff_en_fluxes">
-				<clb name="EnergyBounds"/> 	
+				 <clb name="EnergyBounds"/> 	
 			</baseParam>
 		</vi>
 	</get>
@@ -22,33 +22,29 @@ fluxes<?xml version="1.0"?>
 					<spectro yAxis="y-left"/>
 				</param>
 			</params> 
-			<!--<axes><xAxis>
-                <timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
-                  <range extend="true"/>
-                  <tick position="outwards" minorGrid="false" majorGrid="false"/>
-                  <legend/>
-                </timeAxis>
-              </xAxis>
-              <yAxis>
-                <digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
-                  <range extend="true"/>
-                  <tick position="outwards" minorGrid="false" majorGrid="false"/>
-                  <legend/>
-                </digitalAxis>
-                <digitalAxis id="y-right" position="right" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
-                  <range extend="true"/>
-                  <tick position="outwards" minorGrid="false" majorGrid="false"/>
-                  <legend/>
-                </digitalAxis>
-              </yAxis>
+			<axes>
+				<xAxis>
+					<timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</timeAxis>
+				</xAxis>
+				<yAxis>
+					<digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</digitalAxis>                 
+				</yAxis>
 				<zAxis>
 					<colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
 						<range extend="true"/>
 						<tick position="outwards" minorGrid="false" majorGrid="false"/>
 					</colorAxis>
 				</zAxis>
-				</axes>-->
-		</timePlot>  
-	  </plot> 
+			</axes> 
+	     </timePlot>  
+	   </plot>
 	</output>
 </param>
diff --git a/PARAM_DEF/mav_swia_cspec.xml b/PARAM_DEF/mav_swia_cspec.xml
index da186cb..29a1050 100644
--- a/PARAM_DEF/mav_swia_cspec.xml
+++ b/PARAM_DEF/mav_swia_cspec.xml
@@ -9,12 +9,42 @@
 	<get>
 		<vi name="mavpds:swia:specboard">
 			<baseParam name="spectra_counts">
-				<clb name="EnergyBound"/>
+				<clb name="EnergyBounds"/>
 			</baseParam>
 		</vi>
 	</get>
 	<process/>
-	<output>
-	<!--<plot>SPECTRA</plot>-->
+	<output> 
+		<plot>
+		<timePlot>
+			<params>
+				<param id="mav_swia_cspec">
+					<spectro yAxis="y-left"/>
+				</param>
+			</params> 
+			<axes>
+				<xAxis>
+					<timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</timeAxis>
+				</xAxis>
+				<yAxis>
+					<digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</digitalAxis>					 
+				</yAxis>
+				<zAxis>
+					<colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+					</colorAxis>
+				</zAxis>
+			</axes>
+		</timePlot>  
+	  </plot>	 
 	</output>
 </param>
diff --git a/PARAM_DEF/mav_swia_fspec.xml b/PARAM_DEF/mav_swia_fspec.xml
index 432f019..9746dcb 100644
--- a/PARAM_DEF/mav_swia_fspec.xml
+++ b/PARAM_DEF/mav_swia_fspec.xml
@@ -1,20 +1,51 @@
 <?xml version="1.0"?>
 <!-- TBD ENERGY TABLE CHANGING -->
 <param xml:id="mav_swia_fspec">
-<info>
-<table>
-  <boundsTable name="Energy" boundsName="EnergyBounds" units="eV"/>
-</table>
-</info>
-<get>
-<vi name="mavpds:swia:specboard">
-<baseParam name="spectra_diff_en_fluxes"/>
-<clb name="energyBounds"/>
-</vi>
-</get>
-<process/>
-<output>
-<!--<plot>SPECTRA</plot>-->
-</output>
+	<info>
+		<table>
+			<boundsTable name="Energy" boundsName="EnergyBounds" units="eV"/>
+		</table>
+	</info>
+	<get>
+		<vi name="mavpds:swia:specboard">
+			<baseParam name="spectra_diff_en_fluxes">
+				<clb name="EnergyBounds"/>
+			</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output>
+	   <plot>
+		<timePlot>
+			<params>
+				<param id="mav_swia_fspec">
+					<spectro yAxis="y-left"/>
+				</param>
+			</params> 
+			<axes>
+				<xAxis>
+					<timeAxis format="dd/mm/yy" reverse="false" scale="linear" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</timeAxis>
+				</xAxis>
+				<yAxis>
+					<digitalAxis id="y-left" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+						<legend/>
+					</digitalAxis>					 
+				</yAxis>
+				<zAxis>
+					<colorAxis colorMapIndex="1" reverse="false" scale="logarithmic" color="[0,0,0]" thickness="1" showLegend="true" showTickMark="true">
+						<range extend="true"/>
+						<tick position="outwards" minorGrid="false" majorGrid="false"/>
+					</colorAxis>
+				</zAxis>
+			</axes>
+		</timePlot>  
+	  </plot>
+	</output>
 </param>
 
--
libgit2 0.21.2