From ec4ebf81436245b6343265c8f47e860eba879cb4 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Wed, 18 Jan 2017 16:03:42 +0100
Subject: [PATCH] orbit plot mars/venus

---
 PARAM_DEF/mav_xyz_mso.xml    | 49 ++++++++++++++++---------------------------------
 PARAM_DEF/mex_xyz.xml        | 85 ++++++++++++++++++++++++++++++++++---------------------------------------------------
 PARAM_DEF/pvo_orb_xyzvso.xml | 23 +++--------------------
 PARAM_DEF/vex_xyz.xml        | 23 +++--------------------
 PARAM_DEF/xyz_mgs_mso.xml    | 35 ++++++++++++++++++++++++++++++++++-
 5 files changed, 90 insertions(+), 125 deletions(-)

diff --git a/PARAM_DEF/mav_xyz_mso.xml b/PARAM_DEF/mav_xyz_mso.xml
index d078699..74f9666 100644
--- a/PARAM_DEF/mav_xyz_mso.xml
+++ b/PARAM_DEF/mav_xyz_mso.xml
@@ -8,10 +8,10 @@
 	</get>
 	<process/>
 	<output>
-	<plot>
+		<plot>
 		<xyPlot isotropic="true">
-		<params>
-			<param id="mav_xyz_mso">
+			<params>
+				<param id="mav_xyz_mso">
 					<orbitserie projection="XR" xAxis="xaxis_id" yAxis="y-left" id="1">
 						<line type="line" style="plain" width="1" color="[0,0,255]" />
 						<timeTick step="auto" number="0" minor="0" color="[255,0,0]">
@@ -20,37 +20,20 @@
 							<symbol type="full-circle" size="4" color="[255,0,255]"/>
 						</timeTick>
 					</orbitserie>
-			</param>
-		</params>
-		<additionalObjects>
-			 <curvePlot serieId="1" color="[0,0,255]" width="4" style="long-spaced-dot">
-					<function name="mars_bowshock">
-						<attributes>
-							<attribute name="param1" value="135."/>
-							<attribute name="param2" value="2.04"/>
-							<attribute name="param3" value="1.02"/>
-							<attribute name="param4" value="0.55"/>
-						</attributes>
-					</function>
-			</curvePlot>
-			<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
-					<function name="venus_magnetopause">
-						<attributes>
-							<attribute name="param1" value="1.07"/>
-							<attribute name="param2" value="-4."/>
-							<attribute name="param3" value="1.5"/>
-							<attribute name="param4" value="3."/>
-						</attributes>
-					</function>
-					</curvePlot> 
-			<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
-					<function name="circle">
-						<attributes>
-						</attributes>
-					</function>
-			</curvePlot>
+				</param>
+			</params>
+			<additionalObjects>
+				<curvePlot serieId="1" color="[0,0,255]" width="4" style="long-spaced-dot">
+					<function name="mars_bowshock"/>				
+				</curvePlot>
+				<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
+					<function name="mars_magnetopause"/>					
+				</curvePlot> 
+				<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
+					<function name="circle"/>				
+				</curvePlot>
 			</additionalObjects> 
 		</xyPlot>
-	</plot>	
+		</plot>	
 	</output>
 </param>
diff --git a/PARAM_DEF/mex_xyz.xml b/PARAM_DEF/mex_xyz.xml
index 174f1c6..731b7e5 100644
--- a/PARAM_DEF/mex_xyz.xml
+++ b/PARAM_DEF/mex_xyz.xml
@@ -1,55 +1,38 @@
 <?xml version="1.0"?>
-<param xml:id="mex_xyz"><!--<TemporaryFillValue>NaN</TemporaryFillValue>-->
+<param xml:id="mex_xyz">
 	<get>
 		<vi name="mex:orb:all">
 			<baseParam name="MEX"/>
-			</vi>
-			</get>
-			<process>$mex_orb_all_MEX/RADIUS_MARS</process> 
-			<output>
-			<plot>
-				<xyPlot isotropic="true">
-				<params>
-					<param id="mex_xyz">
-							<orbitserie projection="XR" xAxis="xaxis_id" yAxis="y-left" id="1">
-								<line type="line" style="plain" width="1" color="[0,0,255]" />
-								<timeTick step="auto" number="0" minor="0" color="[255,0,0]">
-									<font name="sans-serif" size="8" style="upright" weight="bold"/>
-									<firstSymbol type="triangle" size="4" color="[0,255,0]"/>
-									<symbol type="full-circle" size="4" color="[255,0,255]"/>
-								</timeTick>
-							</orbitserie>
-					</param>
-				</params>
-				<additionalObjects>
-					<curvePlot serieId="1" color="[0,0,255]" width="4" style="long-spaced-dot">
-							<function name="mars_bowshock">
-								<attributes>
-									<attribute name="param1" value="135."/>
-									<attribute name="param2" value="2.04"/>
-									<attribute name="param3" value="1.02"/>
-									<attribute name="param4" value="0.55"/>
-								</attributes>
-							</function>
-					</curvePlot>
-					<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
-							<function name="venus_magnetopause">
-								<attributes>
-									<attribute name="param1" value="1.07"/>
-									<attribute name="param2" value="-4."/>
-									<attribute name="param3" value="1.5"/>
-									<attribute name="param4" value="3."/>
-								</attributes>
-							</function>
-							</curvePlot>
-					<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
-							<function name="circle">
-								<attributes>
-								</attributes>
-							</function>
-					</curvePlot>
-				</additionalObjects> 
-				</xyPlot>
-			</plot>
-			</output>
-			</param>
+		</vi>
+	</get>
+	<process>$mex_orb_all_MEX/RADIUS_MARS</process> 
+	<output>
+		<plot>
+		<xyPlot isotropic="true">
+			<params>
+				<param id="mex_xyz">
+					<orbitserie projection="XR" xAxis="xaxis_id" yAxis="y-left" id="1">
+						<line type="line" style="plain" width="1" color="[0,0,255]" />
+						<timeTick step="auto" number="0" minor="0" color="[255,0,0]">
+							<font name="sans-serif" size="8" style="upright" weight="bold"/>
+							<firstSymbol type="triangle" size="4" color="[0,255,0]"/>
+							<symbol type="full-circle" size="4" color="[255,0,255]"/>
+						</timeTick>
+					</orbitserie>
+				</param>
+			</params>			
+			<additionalObjects>
+				<curvePlot serieId="1" color="[0,0,255]" width="4" style="long-spaced-dot">
+					<function name="mars_bowshock"/>				
+				</curvePlot>
+				<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
+					<function name="mars_magnetopause"/>								
+				</curvePlot>
+				<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
+					<function name="circle"/>
+				</curvePlot>
+			</additionalObjects> 
+		</xyPlot>
+		</plot>
+	</output>
+</param>
diff --git a/PARAM_DEF/pvo_orb_xyzvso.xml b/PARAM_DEF/pvo_orb_xyzvso.xml
index a6d2ad5..1d52df1 100644
--- a/PARAM_DEF/pvo_orb_xyzvso.xml
+++ b/PARAM_DEF/pvo_orb_xyzvso.xml
@@ -25,30 +25,13 @@
 			</params>
 			<additionalObjects>
 				<curvePlot serieId="1" color="[0,0,255]" width="4" style="long-spaced-dot">
-						<function name="venus_bowshock">
-							<attributes>
-								<attribute name="param1" value="145."/>
-								<attribute name="param2" value="1.35"/>
-								<attribute name="param3" value="1.18"/>
-								<attribute name="param4" value="0.55"/>
-							</attributes>
-						</function>
+						<function name="venus_bowshock"/>							
 				</curvePlot>
 				<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
-						<function name="venus_magnetopause">
-							<attributes>
-								<attribute name="param1" value="1.07"/>
-								<attribute name="param2" value="-4."/>
-								<attribute name="param3" value="1.5"/>
-								<attribute name="param4" value="3."/>
-							</attributes>
-						</function>
+						<function name="venus_magnetopause"/>							
 				</curvePlot>
 				<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
-						<function name="circle">
-							<attributes>
-							</attributes>
-						</function>
+						<function name="circle"/>
 				</curvePlot>
 			</additionalObjects>
 		  </xyPlot>
diff --git a/PARAM_DEF/vex_xyz.xml b/PARAM_DEF/vex_xyz.xml
index a84853b..c751a3d 100644
--- a/PARAM_DEF/vex_xyz.xml
+++ b/PARAM_DEF/vex_xyz.xml
@@ -23,30 +23,13 @@
 			</params>
 			<additionalObjects>
 				<curvePlot serieId="1" color="[0,0,255]" width="4" style="long-spaced-dot">
-						<function name="venus_bowshock">
-							<attributes>
-								<attribute name="param1" value="145."/>
-								<attribute name="param2" value="1.35"/>
-								<attribute name="param3" value="1.18"/>
-								<attribute name="param4" value="0.55"/>
-							</attributes>
-						</function>
+						<function name="venus_bowshock"/>					
 				</curvePlot>
 				<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
-						<function name="venus_magnetopause">
-							<attributes>
-								<attribute name="param1" value="1.07"/>
-								<attribute name="param2" value="-4."/>
-								<attribute name="param3" value="1.5"/>
-								<attribute name="param4" value="3."/>
-							</attributes>
-						</function>
+						<function name="venus_magnetopause"/>
 				</curvePlot>
 				<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
-						<function name="circle">
-							<attributes>
-							</attributes>
-						</function>
+						<function name="circle"/>
 				</curvePlot>
 			</additionalObjects>
 	</xyPlot>
diff --git a/PARAM_DEF/xyz_mgs_mso.xml b/PARAM_DEF/xyz_mgs_mso.xml
index ea54439..55b4750 100644
--- a/PARAM_DEF/xyz_mgs_mso.xml
+++ b/PARAM_DEF/xyz_mgs_mso.xml
@@ -1,2 +1,35 @@
 <?xml version="1.0"?>
-<param xml:id="xyz_mgs_mso"><!--<TemporaryFillValue>NaN</TemporaryFillValue>--><get><vi name="mgs:orb:all"><baseParam name="MSO"/></vi></get><process/><output><!--<plot>ORBIT</plot>--></output></param>
+<param xml:id="xyz_mgs_mso">
+	<get>
+		<vi name="mgs:orb:all">
+			<baseParam name="MSO"/>
+		</vi>
+	</get>
+	<process/>
+	<output>
+		<plot>
+			<xyPlot isotropic="true">
+			<params>
+				<param id="xyz_mgs_mso">
+					<orbitserie projection="XR" xAxis="xaxis_id" yAxis="y-left" id="1">
+						<line type="line" style="plain" width="1" color="[0,0,255]" />
+						<timeTick step="auto" number="0" minor="0" color="[255,0,0]">
+							<font name="sans-serif" size="8" style="upright" weight="bold"/>
+							<firstSymbol type="triangle" size="4" color="[0,255,0]"/>
+							<symbol type="full-circle" size="4" color="[255,0,255]"/>
+						</timeTick>
+					</orbitserie>
+				</param>
+			</params>
+			<additionalObjects>				
+				<curvePlot serieId="1" color="[255,0,0]" width="4" style="dot">
+						<function name="mars_magnetopause"/>					
+				</curvePlot>
+				<curvePlot serieId="1" color="[255,128,0]" width="4" style="plain">
+					<function name="circle"/>
+				</curvePlot>
+			</additionalObjects> 
+			</xyPlot>
+		</plot>	
+	</output>
+</param>
--
libgit2 0.21.2