diff --git a/INTERNAL_PARAM_DEF/vex_els_energy.xml b/INTERNAL_PARAM_DEF/vex_els_energy.xml
new file mode 100644
index 0000000..198765b
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/vex_els_energy.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<param xml:id="vex_els_energy">
+ <get>
+ <vi name='vex:els:all'>
+ <baseParam name="ETableN">
+ <clb name="REF"/>
+ </baseParam>
+ </vi>
+ </get>
+ <process description="VEX ELS Energy">#getClbInfo($vex_els_all_ETableN;0:REF_0;1:REF_1;2:REF_2)</process>
+ <output/>
+</param>
\ No newline at end of file
diff --git a/mav_sta_c0_energy_mass0.xml b/mav_sta_c0_energy_mass0.xml
deleted file mode 100644
index fa909a5..0000000
--- a/mav_sta_c0_energy_mass0.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="mav_sta_c0_energy_mass0">
- <get>
- <vi name='mavpds:sta:c0'>
- <baseParam name="swp_ind" useNearestValue="true">
- <clb name="energy"/>
- <clb name="nswp"/>
- <clb name="nmass"/>
- <clb name="nenergy"/>
- </baseParam>
- </vi>
- </get>
- <process description="MAVEN STATIC C0 Energy for Mass 0">#getMavenStaticEnergy($mavpds_sta_c0_swp_ind;0)</process>
- <output/>
-</param>
diff --git a/mav_sta_c0_tab2d.xml b/mav_sta_c0_tab2d.xml
deleted file mode 100644
index 3e4bed2..0000000
--- a/mav_sta_c0_tab2d.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="mav_sta_c0_tab2d">
- <get>
- <vi name="mavpds:sta:c0">
- <baseParam name="eflux">
- </baseParam>
- </vi>
- </get>
- <process/>
- <output/>
-</param>
diff --git a/mav_sta_c6_energy_mass0.xml b/mav_sta_c6_energy_mass0.xml
deleted file mode 100644
index 1884c34..0000000
--- a/mav_sta_c6_energy_mass0.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="mav_sta_c6_energy_mass0">
- <get>
- <vi name='mavpds:sta:c6'>
- <baseParam name="swp_ind" useNearestValue="true">
- <clb name="energy"/>
- <clb name="nswp"/>
- <clb name="nmass"/>
- <clb name="nenergy"/>
- </baseParam>
- </vi>
- </get>
- <process description="MAVEN STATIC C6 Energy - Mass 0">#getMavenStaticEnergy($mavpds_sta_c6_swp_ind;0)</process>
- <output/>
-</param>
diff --git a/mav_sta_c6_tab2d.xml b/mav_sta_c6_tab2d.xml
deleted file mode 100644
index a9318b1..0000000
--- a/mav_sta_c6_tab2d.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="mav_sta_c6_tab2d">
- <get>
- <vi name="mavpds:sta:c6">
- <baseParam name="eflux">
- </baseParam>
- </vi>
- </get>
- <process/>
- <output/>
-</param>
diff --git a/mav_xyz_mso.xml b/mav_xyz_mso.xml
index 5c8707a..5bba403 100644
--- a/mav_xyz_mso.xml
+++ b/mav_xyz_mso.xml
@@ -1,2 +1,56 @@
<?xml version="1.0"?>
-<param xml:id="mav_xyz_mso"><!--<TemporaryFillValue>NaN</TemporaryFillValue>--><get><vi name="maven:orb:marsobs"><baseParam name="MAVEN_MSO"/></vi></get><process/><output><!--<plot>ORBIT</plot>--></output></param>
+<param xml:id="mav_xyz_mso">
+ <!--<TemporaryFillValue>NaN</TemporaryFillValue>-->
+ <get>
+ <vi name="maven:orb:marsobs">
+ <baseParam name="MAVEN_MSO"/>
+ </vi>
+ </get>
+ <process/>
+ <output>
+ <plot>
+ <xyPlot isotropic="true">
+ <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]">
+ <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="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>
+ </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>
diff --git a/mex_xyz.xml b/mex_xyz.xml
index 43c1b3d..8b59363 100644
--- a/mex_xyz.xml
+++ b/mex_xyz.xml
@@ -7,49 +7,49 @@
</get>
<process description="km2rm=2.945e-4">$mex_orb_all_MEX*2.945e-4</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="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>
- </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>
+ <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="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>
+ </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>
diff --git a/vex_els_spec.xml b/vex_els_spec.xml
index 3ac9312..e7d1341 100644
--- a/vex_els_spec.xml
+++ b/vex_els_spec.xml
@@ -10,6 +10,6 @@
<amdaParam name='vex_els_energy'/>
</get>
<process description="VEX ELS Flux">#merge($vex_els_energy;els_calculate($vex_els_all_ELS,$vex_els_all_TimeCompres,$vex_els_all_EnergyCompres,$vex_els_energy,10)</process>
- <output />
+ <output/>
</param>
--
libgit2 0.21.2