diff --git a/INTERNAL_PARAM_DEF/bepi_mea2_padmax.xml b/INTERNAL_PARAM_DEF/bepi_mea2_padmax.xml
new file mode 100644
index 0000000..8b21ca7
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/bepi_mea2_padmax.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmax">
+	<get>
+		<vi name="bepi:mea2:pap">
+			<baseParam name="energy_delta_minus"/>
+		</vi>
+	</get>
+	<process/>
+	<output/> 
+</param>
diff --git a/INTERNAL_PARAM_DEF/bepi_mea2_padmin.xml b/INTERNAL_PARAM_DEF/bepi_mea2_padmin.xml
new file mode 100644
index 0000000..f140808
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/bepi_mea2_padmin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmin">
+	<get>
+		<vi name="bepi:mea2:pap">
+			<baseParam name="energy_delta_plus"/>
+		</vi>
+	</get>
+	<process/>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea1_pad_e0.xml b/PARAM_DEF/bepi_mea1_pad_e0.xml
index d2deee8..c7a2aaf 100644
--- a/PARAM_DEF/bepi_mea1_pad_e0.xml
+++ b/PARAM_DEF/bepi_mea1_pad_e0.xml
@@ -2,7 +2,7 @@
 <param xml:id="bepi_mea1_pad_e0">
 	<info>
 		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
+            <centerTable name="Channels" centerName="Channels" units="deg" size="22.5"/>
 		</table>
 	</info>
 	<get>
@@ -23,7 +23,7 @@
 			</params> 
 			<axes>
 				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
+					<digitalAxis id="y-left" scale="linear" /> 
 				</yAxis>
 				<zAxis>
 					<colorAxis colorMapIndex="1" scale="logarithmic"/>
diff --git a/PARAM_DEF/bepi_mea1_pad_e1.xml b/PARAM_DEF/bepi_mea1_pad_e1.xml
index 8405f38..bf09948 100644
--- a/PARAM_DEF/bepi_mea1_pad_e1.xml
+++ b/PARAM_DEF/bepi_mea1_pad_e1.xml
@@ -2,7 +2,7 @@
 <param xml:id="bepi_mea1_pad_e1">
 	<info>
 		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
+            <centerTable name="Channels"  centerName="Channels" units="deg" size="22.5"/>
 		</table>
 	</info>
 	<get>
@@ -23,7 +23,7 @@
 			</params> 
 			<axes>
 				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
+					<digitalAxis id="y-left" scale="linear" /> 
 				</yAxis>
 				<zAxis>
 					<colorAxis colorMapIndex="1" scale="logarithmic"/>
diff --git a/PARAM_DEF/bepi_mea1_pad_e2.xml b/PARAM_DEF/bepi_mea1_pad_e2.xml
index 81051a9..05569a8 100644
--- a/PARAM_DEF/bepi_mea1_pad_e2.xml
+++ b/PARAM_DEF/bepi_mea1_pad_e2.xml
@@ -2,7 +2,7 @@
 <param xml:id="bepi_mea1_pad_e2">
 	<info>
 		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
+            <centerTable name="Channels" centerName="Channels" units="deg" size="22.5"/>
 		</table>
 	</info>
 	<get>
@@ -23,7 +23,7 @@
 			</params> 
 			<axes>
 				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
+					<digitalAxis id="y-left" scale="linear" /> 
 				</yAxis>
 				<zAxis>
 					<colorAxis colorMapIndex="1" scale="logarithmic"/>
diff --git a/PARAM_DEF/bepi_mea1_pad_e3.xml b/PARAM_DEF/bepi_mea1_pad_e3.xml
index 391d2fb..c82a760 100644
--- a/PARAM_DEF/bepi_mea1_pad_e3.xml
+++ b/PARAM_DEF/bepi_mea1_pad_e3.xml
@@ -2,7 +2,7 @@
 <param xml:id="bepi_mea1_pad_e3">
 	<info>
 		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
+            <centerTable name="Channels" centerName="Channels" units="deg" size="22.5"/>
 		</table>
 	</info>
 	<get>
@@ -23,7 +23,7 @@
 			</params> 
 			<axes>
 				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
+					<digitalAxis id="y-left" scale="linear" /> 
 				</yAxis>
 				<zAxis>
 					<colorAxis colorMapIndex="1" scale="logarithmic"/>
diff --git a/PARAM_DEF/bepi_mea1_padmax_e4.xml b/PARAM_DEF/bepi_mea1_padmax_e4.xml
deleted file mode 100644
index 33c8f79..0000000
--- a/PARAM_DEF/bepi_mea1_padmax_e4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea1_padmax_e4">
-	<get>
-        <amdaParam name="bepi_mea1_padmax"/>
-	</get>
-    <process>$bepi_mea1_padmax[4]</process>
-	<output/> 
-</param>
diff --git a/PARAM_DEF/bepi_mea1_padmin_e4.xml b/PARAM_DEF/bepi_mea1_padmin_e4.xml
deleted file mode 100644
index f5ac4ee..0000000
--- a/PARAM_DEF/bepi_mea1_padmin_e4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea1_padmin_e4">
-	<get>
-        <amdaParam name="bepi_mea1_padmin"/>
-	</get>
-    <process>$bepi_mea1_padmin[4]</process>
-	<output/> 
-</param>
diff --git a/PARAM_DEF/bepi_mea2_pad_e0.xml b/PARAM_DEF/bepi_mea2_pad_e0.xml
new file mode 100644
index 0000000..19c8a1d
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_pad_e0.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_pad_e0">
+	<info>
+		<table>
+            <centerTable name="Channels"  centerName="Channels" units="deg" size="22.5"/>
+		</table>
+	</info>
+	<get>
+		<vi name="bepi:mea2:pap">
+			<baseParam name="pap_E0">
+                		<clb name="Channels"/>
+			</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output> 
+		<plot>
+		<timePlot>
+			<params>
+				<param id="bepi_mea2_pad_e0">
+					<spectro yAxis="y-left"/>
+				</param>
+			</params> 
+			<axes>
+				<yAxis>
+					<digitalAxis id="y-left" scale="linear" /> 
+				</yAxis>
+				<zAxis>
+					<colorAxis colorMapIndex="1" scale="logarithmic"/>
+				</zAxis>
+			</axes>
+		</timePlot>  
+	  </plot>	 
+	</output>
+</param>
diff --git a/PARAM_DEF/bepi_mea2_pad_e1.xml b/PARAM_DEF/bepi_mea2_pad_e1.xml
new file mode 100644
index 0000000..6ec9a06
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_pad_e1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_pad_e1">
+	<info>
+		<table>
+            <centerTable name="Channels" centerName="Channels" units="deg" size="22.5"/>
+		</table>
+	</info>
+	<get>
+		<vi name="bepi:mea2:pap">
+			<baseParam name="pap_E1">
+                		<clb name="Channels"/>
+			</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output> 
+		<plot>
+		<timePlot>
+			<params>
+				<param id="bepi_mea2_pad_e1">
+					<spectro yAxis="y-left"/>
+				</param>
+			</params> 
+			<axes>
+				<yAxis>
+					<digitalAxis id="y-left" scale="linear" /> 
+				</yAxis>
+				<zAxis>
+					<colorAxis colorMapIndex="1" scale="logarithmic"/>
+				</zAxis>
+			</axes>
+		</timePlot>  
+	  </plot>	 
+	</output>
+</param>
diff --git a/PARAM_DEF/bepi_mea2_pad_e2.xml b/PARAM_DEF/bepi_mea2_pad_e2.xml
new file mode 100644
index 0000000..f390d4a
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_pad_e2.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_pad_e2">
+	<info>
+		<table>
+            <centerTable name="Channels" centerName="Channels" units="deg" size="22.5"/>
+		</table>
+	</info>
+	<get>
+		<vi name="bepi:mea2:pap">
+			<baseParam name="pap_E2">
+                		<clb name="Channels"/>
+			</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output> 
+		<plot>
+		<timePlot>
+			<params>
+				<param id="bepi_mea2_pad_e2">
+					<spectro yAxis="y-left"/>
+				</param>
+			</params> 
+			<axes>
+				<yAxis>
+					<digitalAxis id="y-left" scale="linear" /> 
+				</yAxis>
+				<zAxis>
+					<colorAxis colorMapIndex="1" scale="logarithmic"/>
+				</zAxis>
+			</axes>
+		</timePlot>  
+	  </plot>	 
+	</output>
+</param>
diff --git a/PARAM_DEF/bepi_mea2_pad_e3.xml b/PARAM_DEF/bepi_mea2_pad_e3.xml
new file mode 100644
index 0000000..156adf5
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_pad_e3.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_pad_e3">
+	<info>
+		<table>
+            <centerTable name="Channels" centerName="Channels" units="deg" size="22.5"/>
+		</table>
+	</info>
+	<get>
+		<vi name="bepi:mea2:pap">
+			<baseParam name="pap_E3">
+                		<clb name="Channels"/>
+			</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output> 
+		<plot>
+		<timePlot>
+			<params>
+				<param id="bepi_mea2_pad_e3">
+					<spectro yAxis="y-left"/>
+				</param>
+			</params> 
+			<axes>
+				<yAxis>
+					<digitalAxis id="y-left" scale="linear" /> 
+				</yAxis>
+				<zAxis>
+					<colorAxis colorMapIndex="1" scale="logarithmic"/>
+				</zAxis>
+			</axes>
+		</timePlot>  
+	  </plot>	 
+	</output>
+</param>
diff --git a/PARAM_DEF/bepi_mea2_pade0.xml b/PARAM_DEF/bepi_mea2_pade0.xml
deleted file mode 100644
index 791d64d..0000000
--- a/PARAM_DEF/bepi_mea2_pade0.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea2_pade0">
-	<info>
-		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
-		</table>
-	</info>
-	<get>
-		<vi name="bepi:mea2:pap">
-			<baseParam name="pap_E0">
-                		<clb name="Channels"/>
-			</baseParam>
-		</vi>
-	</get>
-	<process/>
-	<output> 
-		<plot>
-		<timePlot>
-			<params>
-				<param id="bepi_mea2_pade0">
-					<spectro yAxis="y-left"/>
-				</param>
-			</params> 
-			<axes>
-				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
-				</yAxis>
-				<zAxis>
-					<colorAxis colorMapIndex="1" scale="logarithmic"/>
-				</zAxis>
-			</axes>
-		</timePlot>  
-	  </plot>	 
-	</output>
-</param>
diff --git a/PARAM_DEF/bepi_mea2_pade1.xml b/PARAM_DEF/bepi_mea2_pade1.xml
deleted file mode 100644
index 5d20163..0000000
--- a/PARAM_DEF/bepi_mea2_pade1.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea2_pade1">
-	<info>
-		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
-		</table>
-	</info>
-	<get>
-		<vi name="bepi:mea2:pap">
-			<baseParam name="pap_E1">
-                		<clb name="Channels"/>
-			</baseParam>
-		</vi>
-	</get>
-	<process/>
-	<output> 
-		<plot>
-		<timePlot>
-			<params>
-				<param id="bepi_mea2_pade1">
-					<spectro yAxis="y-left"/>
-				</param>
-			</params> 
-			<axes>
-				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
-				</yAxis>
-				<zAxis>
-					<colorAxis colorMapIndex="1" scale="logarithmic"/>
-				</zAxis>
-			</axes>
-		</timePlot>  
-	  </plot>	 
-	</output>
-</param>
diff --git a/PARAM_DEF/bepi_mea2_pade2.xml b/PARAM_DEF/bepi_mea2_pade2.xml
deleted file mode 100644
index 08eec7c..0000000
--- a/PARAM_DEF/bepi_mea2_pade2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea2_pade2">
-	<info>
-		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
-		</table>
-	</info>
-	<get>
-		<vi name="bepi:mea2:pap">
-			<baseParam name="pap_E2">
-                		<clb name="Channels"/>
-			</baseParam>
-		</vi>
-	</get>
-	<process/>
-	<output> 
-		<plot>
-		<timePlot>
-			<params>
-				<param id="bepi_mea2_pade2">
-					<spectro yAxis="y-left"/>
-				</param>
-			</params> 
-			<axes>
-				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
-				</yAxis>
-				<zAxis>
-					<colorAxis colorMapIndex="1" scale="logarithmic"/>
-				</zAxis>
-			</axes>
-		</timePlot>  
-	  </plot>	 
-	</output>
-</param>
diff --git a/PARAM_DEF/bepi_mea2_pade3.xml b/PARAM_DEF/bepi_mea2_pade3.xml
deleted file mode 100644
index 1c4b87b..0000000
--- a/PARAM_DEF/bepi_mea2_pade3.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea2_pade3">
-	<info>
-		<table>
-            <centerTable name="Channels" dim="2" centerName="Channels" units="deg" size="22.5"/>
-		</table>
-	</info>
-	<get>
-		<vi name="bepi:mea2:pap">
-			<baseParam name="pap_E3">
-                		<clb name="Channels"/>
-			</baseParam>
-		</vi>
-	</get>
-	<process/>
-	<output> 
-		<plot>
-		<timePlot>
-			<params>
-				<param id="bepi_mea2_pade3">
-					<spectro yAxis="y-left"/>
-				</param>
-			</params> 
-			<axes>
-				<yAxis>
-					<digitalAxis id="y-left" scale="logarithmic" /> 
-				</yAxis>
-				<zAxis>
-					<colorAxis colorMapIndex="1" scale="logarithmic"/>
-				</zAxis>
-			</axes>
-		</timePlot>  
-	  </plot>	 
-	</output>
-</param>
diff --git a/PARAM_DEF/bepi_mea2_padmax.xml b/PARAM_DEF/bepi_mea2_padmax.xml
deleted file mode 100644
index 8b21ca7..0000000
--- a/PARAM_DEF/bepi_mea2_padmax.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea2_padmax">
-	<get>
-		<vi name="bepi:mea2:pap">
-			<baseParam name="energy_delta_minus"/>
-		</vi>
-	</get>
-	<process/>
-	<output/> 
-</param>
diff --git a/PARAM_DEF/bepi_mea2_padmax_e0.xml b/PARAM_DEF/bepi_mea2_padmax_e0.xml
new file mode 100644
index 0000000..6af75ba
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmax_e0.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmax_e0">
+	<get>
+        <amdaParam name="bepi_mea2_padmax"/>
+	</get>
+    <process>$bepi_mea2_padmax[0]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmax_e1.xml b/PARAM_DEF/bepi_mea2_padmax_e1.xml
new file mode 100644
index 0000000..2e663e4
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmax_e1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmax_e1">
+	<get>
+        <amdaParam name="bepi_mea2_padmax"/>
+	</get>
+    <process>$bepi_mea2_padmax[1]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmax_e2.xml b/PARAM_DEF/bepi_mea2_padmax_e2.xml
new file mode 100644
index 0000000..d02d283
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmax_e2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmax_e2">
+	<get>
+        <amdaParam name="bepi_mea2_padmax"/>
+	</get>
+    <process>$bepi_mea2_padmax[2]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmax_e3.xml b/PARAM_DEF/bepi_mea2_padmax_e3.xml
new file mode 100644
index 0000000..be5d03f
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmax_e3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmax_e3">
+	<get>
+        <amdaParam name="bepi_mea2_padmax"/>
+	</get>
+    <process>$bepi_mea2_padmax[3]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmin.xml b/PARAM_DEF/bepi_mea2_padmin.xml
deleted file mode 100644
index f140808..0000000
--- a/PARAM_DEF/bepi_mea2_padmin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="bepi_mea2_padmin">
-	<get>
-		<vi name="bepi:mea2:pap">
-			<baseParam name="energy_delta_plus"/>
-		</vi>
-	</get>
-	<process/>
-	<output/> 
-</param>
diff --git a/PARAM_DEF/bepi_mea2_padmin_e0.xml b/PARAM_DEF/bepi_mea2_padmin_e0.xml
new file mode 100644
index 0000000..5ed0c25
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmin_e0.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmin_e0">
+	<get>
+        <amdaParam name="bepi_mea2_padmin"/>
+	</get>
+    <process>$bepi_mea2_padmin[0]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmin_e1.xml b/PARAM_DEF/bepi_mea2_padmin_e1.xml
new file mode 100644
index 0000000..9bfde46
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmin_e1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmin_e1">
+	<get>
+        <amdaParam name="bepi_mea2_padmin"/>
+	</get>
+    <process>$bepi_mea2_padmin[1]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmin_e2.xml b/PARAM_DEF/bepi_mea2_padmin_e2.xml
new file mode 100644
index 0000000..a210438
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmin_e2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmin_e2">
+	<get>
+        <amdaParam name="bepi_mea2_padmin"/>
+	</get>
+    <process>$bepi_mea2_padmin[2]</process>
+	<output/> 
+</param>
diff --git a/PARAM_DEF/bepi_mea2_padmin_e3.xml b/PARAM_DEF/bepi_mea2_padmin_e3.xml
new file mode 100644
index 0000000..b294d4a
--- /dev/null
+++ b/PARAM_DEF/bepi_mea2_padmin_e3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="bepi_mea2_padmin_e3">
+	<get>
+        <amdaParam name="bepi_mea2_padmin"/>
+	</get>
+    <process>$bepi_mea2_padmin[3]</process>
+	<output/> 
+</param>
--
libgit2 0.21.2