diff --git a/PARAM_DEF/irm_sul_h10.xml b/PARAM_DEF/irm_sul_h10.xml
index b047f5d..cc33148 100644
--- a/PARAM_DEF/irm_sul_h10.xml
+++ b/PARAM_DEF/irm_sul_h10.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<param xml:id='irm_sul_h10'>
+<param xml:id='irm_sul_h40'>
   <get>
      <vi name='irm:sul:all'>
-        <baseParam name='Protons_10'/>
+        <baseParam name='Proton_rate'/>
     </vi>
   </get>
   <process/>
diff --git a/PARAM_DEF/tha_el_sp.xml b/PARAM_DEF/tha_el_sp.xml
index d9d1f64..f116e40 100644
--- a/PARAM_DEF/tha_el_sp.xml
+++ b/PARAM_DEF/tha_el_sp.xml
@@ -2,7 +2,7 @@
 <param xml:id="tha_el_sp">
 	<info>
 		<table>
-			<centerAutoTable variable="true" name="Energy" centerName="tha_el_sp_energy" log="false" units="eV"/>
+			<centerAutoTable variable="true" fullVariable="true" name="Energy" centerName="tha_el_sp_energy" log="false" units="eV"/>
 		</table>
 	</info> 
 	<gap_threshold>8</gap_threshold>
diff --git a/PARAM_DEF/tha_ion_sp.xml b/PARAM_DEF/tha_ion_sp.xml
index 4673873..7c90983 100644
--- a/PARAM_DEF/tha_ion_sp.xml
+++ b/PARAM_DEF/tha_ion_sp.xml
@@ -2,16 +2,15 @@
 <param xml:id="tha_ion_sp">
 	<info>
 		<table>
-			<centerAutoTable name="energy" centerName="Energy" log="false" units="eV"/>
+			<centerAutoTable variable="true" fullVariable="true" name="energy" centerName="tha_ion_sp_energy" log="false" units="eV"/>
 		</table>
 	</info>
 	<gap_threshold>8</gap_threshold>
 	<get>
 		<vi name="tha:esa:l2i">
-			<baseParam name="Flux">
-				<clb name="Energy"/>
-			</baseParam>
+			<baseParam name="Flux"/>
 		</vi>
+        <amdaParam name='tha_ion_sp_energy'/>
 	</get>
 	<process/>
 	<output>
diff --git a/PARAM_DEF/thb_el_sp.xml b/PARAM_DEF/thb_el_sp.xml
index 3297735..4e1f7ec 100644
--- a/PARAM_DEF/thb_el_sp.xml
+++ b/PARAM_DEF/thb_el_sp.xml
@@ -2,7 +2,7 @@
 <param xml:id="thb_el_sp">
 	<info>
 		<table>
-			<centerAutoTable variable="true" name="Energy" centerName="thb_el_sp_energy" log="false" units="eV"/>
+			<centerAutoTable variable="true"  fullVariable="true" name="Energy" centerName="thb_el_sp_energy" log="false" units="eV"/>
 		</table>
 	</info>
 	<gap_threshold>8</gap_threshold>
diff --git a/PARAM_DEF/thb_ion_sp.xml b/PARAM_DEF/thb_ion_sp.xml
index 259d11d..983b3df 100644
--- a/PARAM_DEF/thb_ion_sp.xml
+++ b/PARAM_DEF/thb_ion_sp.xml
@@ -2,7 +2,7 @@
 <param xml:id="thb_ion_sp">
 	<info>
 		<table>
-			<centerAutoTable name="energy" centerName="thb_ion_sp_energy" log="false" units="eV"/>
+			<centerAutoTable name="energy" variable="true" fullVariable="true" centerName="thb_ion_sp_energy" log="false" units="eV"/>
 		</table>
 	</info>
 	<gap_threshold>8</gap_threshold>
diff --git a/PARAM_DEF/thc_el_sp.xml b/PARAM_DEF/thc_el_sp.xml
index 70421df..bfc2026 100644
--- a/PARAM_DEF/thc_el_sp.xml
+++ b/PARAM_DEF/thc_el_sp.xml
@@ -2,7 +2,7 @@
 <param xml:id="thc_el_sp">
 	<info>
 		<table>
-			<centerAutoTable variable="true" name="Energy" centerName="thc_el_sp_energy" log="false" units="eV"/>
+			<centerAutoTable variable="true" fullVariable="true" name="Energy" centerName="thc_el_sp_energy" log="false" units="eV"/>
 		</table>
 	</info>
 	<gap_threshold>8</gap_threshold>
diff --git a/PARAM_DEF/thc_ion_sp.xml b/PARAM_DEF/thc_ion_sp.xml
index 1ee0799..39bda56 100644
--- a/PARAM_DEF/thc_ion_sp.xml
+++ b/PARAM_DEF/thc_ion_sp.xml
@@ -2,16 +2,15 @@
 <param xml:id="thc_ion_sp">
 	<info>
 		<table>
-			<centerAutoTable name="energy" centerName="Energy" log="false" units="eV"/>
+			<centerAutoTable name="energy" variable="true" fullVariable="true" centerName="thc_ion_sp_energy" log="false" units="eV"/>
 		</table>
 	</info> 
 	<gap_threshold>8</gap_threshold>
 	<get>
 		<vi name="thc:esa:l2i">
-			<baseParam name="Flux">
-				<clb name="Energy"/>
-			</baseParam>
+			<baseParam name="Flux"/>
 		</vi>
+        <amdaParam name='thc_ion_sp_energy'/>
 	</get>
 	<process/>
 	<output>
diff --git a/PARAM_DEF/thd_el_sp.xml b/PARAM_DEF/thd_el_sp.xml
index c03ffdb..cf749c7 100644
--- a/PARAM_DEF/thd_el_sp.xml
+++ b/PARAM_DEF/thd_el_sp.xml
@@ -2,7 +2,7 @@
 <param xml:id="thd_el_sp">
 	<info>
 		<table>
-			<centerAutoTable variable="true" name="Energy" centerName="thd_el_sp_energy" log="false" units="eV"/>
+			<centerAutoTable variable="true" fullVariable="true" name="Energy" centerName="thd_el_sp_energy" log="false" units="eV"/>
 		</table>
 	</info> 
 	<gap_threshold>8</gap_threshold>
diff --git a/PARAM_DEF/thd_ion_sp.xml b/PARAM_DEF/thd_ion_sp.xml
index c6848a3..300c63e 100644
--- a/PARAM_DEF/thd_ion_sp.xml
+++ b/PARAM_DEF/thd_ion_sp.xml
@@ -2,16 +2,15 @@
 <param xml:id="thd_ion_sp">
 	<info>
 		<table>
-			<centerAutoTable name="energy" centerName="Energy" log="false" units="eV"/>
+			<centerAutoTable name="energy" variable="true" fullVariable="true" centerName="thd_ion_sp_energy" log="false" units="eV"/>
 		</table>
 	</info>
 	<gap_threshold>8</gap_threshold>
 	<get>
 		<vi name="thd:esa:l2i">
-			<baseParam name="Flux">
-				<clb name="Energy"/>
-			</baseParam>
+			<baseParam name="Flux"/>
 		</vi>
+        <amdaParam name='thd_ion_sp_energy'/>
 	</get>
 	<process/>
 	<output>
diff --git a/PARAM_DEF/the_el_sp.xml b/PARAM_DEF/the_el_sp.xml
index 0ea9cdd..cf435c1 100644
--- a/PARAM_DEF/the_el_sp.xml
+++ b/PARAM_DEF/the_el_sp.xml
@@ -2,7 +2,7 @@
 <param xml:id="the_el_sp">
 	<info>
 		<table>
-			<centerAutoTable variable="true" name="Energy" centerName="the_el_sp_energy" log="false" units="eV"/>
+			<centerAutoTable variable="true" fullVariable="true" name="Energy" centerName="the_el_sp_energy" log="false" units="eV"/>
 		</table>
 	</info> 
 	<gap_threshold>8</gap_threshold>
diff --git a/PARAM_DEF/the_ion_sp.xml b/PARAM_DEF/the_ion_sp.xml
index 62d3383..687ea7d 100644
--- a/PARAM_DEF/the_ion_sp.xml
+++ b/PARAM_DEF/the_ion_sp.xml
@@ -2,16 +2,15 @@
 <param xml:id="the_ion_sp">
 	<info>
 		<table>
-			<centerAutoTable name="energy" centerName="Energy" log="false" units="eV"/>
+			<centerAutoTable name="energy" variable="true" fullVariable="true" centerName="the_ion_sp_energy" log="false" units="eV"/>
 		</table>
 	</info> 
 	<gap_threshold>8</gap_threshold>
 	<get>
 		<vi name="the:esa:l2i">
-			<baseParam name="Flux">
-				<clb name="Energy"/>
-			</baseParam>
+			<baseParam name="Flux"/>
 		</vi>
+        <amdaParam name='the_ion_sp_energy'/>
 	</get>
 	<process/>
 	<output>
--
libgit2 0.21.2