From 021c7d39ae8f5d8149322651f0aa1074cc95e80f Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Thu, 23 Feb 2023 07:49:16 +0000
Subject: [PATCH] Merge Fix JUNO / JADE parameters definition from amdadev

---
 INTERNAL_PARAM_DEF/jade_e180_energy.xml            | 10 ++++++++++
 INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml      | 10 ----------
 INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml  | 10 ----------
 INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml  | 10 ----------
 INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml      | 10 ----------
 INTERNAL_PARAM_DEF/jade_e300_energy.xml            | 10 ++++++++++
 INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml      | 10 ----------
 INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml  | 10 ----------
 INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml  | 10 ----------
 INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml      | 10 ----------
 INTERNAL_PARAM_DEF/jade_e60_energy.xml             | 10 ++++++++++
 INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml       | 10 ----------
 INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml   | 10 ----------
 INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml   | 10 ----------
 INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml       | 10 ----------
 INTERNAL_PARAM_DEF/jade_ispec_energy.xml           | 10 ++++++++++
 INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml     | 10 ----------
 INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml | 10 ----------
 INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml | 10 ----------
 INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml     | 10 ----------
 PARAM_DEF/jade_e180_cps.xml                        |  6 +++---
 PARAM_DEF/jade_e180_cps_sum.xml                    |  6 +++---
 PARAM_DEF/jade_e180_mode.xml                       |  1 +
 PARAM_DEF/jade_e300_cps.xml                        |  6 +++---
 PARAM_DEF/jade_e300_cps_sum.xml                    |  6 +++---
 PARAM_DEF/jade_e300_mode.xml                       |  1 +
 PARAM_DEF/jade_e60_cps.xml                         |  6 +++---
 PARAM_DEF/jade_e60_cps_sum.xml                     |  6 +++---
 PARAM_DEF/jade_e60_mode.xml                        |  1 +
 PARAM_DEF/jade_ispec_cps.xml                       |  6 +++---
 PARAM_DEF/jade_ispec_cps_sum.xml                   |  6 +++---
 PARAM_DEF/jade_ispec_mode.xml                      |  1 +
 32 files changed, 68 insertions(+), 184 deletions(-)
 create mode 100644 INTERNAL_PARAM_DEF/jade_e180_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml
 create mode 100644 INTERNAL_PARAM_DEF/jade_e300_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml
 create mode 100644 INTERNAL_PARAM_DEF/jade_e60_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml
 create mode 100644 INTERNAL_PARAM_DEF/jade_ispec_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml

diff --git a/INTERNAL_PARAM_DEF/jade_e180_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_energy.xml
new file mode 100644
index 0000000..8378a16
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_e180_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="jade_e180_energy">
+  <get>	  
+    <vi name='juno:jade:e180'>
+      <baseParam name='ENERGY_E180' useNearestValue="true"/>
+    </vi>
+  </get>
+  <process/>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml
deleted file mode 100644
index f67a9b7..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e180_lower_energy_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:e180'>
-      <baseParam name='LOWER_ENERGY_E180' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_e180_LOWER_ENERGY_E180[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml
deleted file mode 100644
index 3a7bde3..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e180_sum_lower_energy">
-  <get>	  
-    <vi name='juno:jade:e180'>
-      <baseParam name='LOWER_ENERGY_E180' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_e180_LOWER_ENERGY_E180[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml
deleted file mode 100644
index babcd0c..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e180_sum_upper_energy">
-  <get>	  
-    <vi name='juno:jade:e180'>
-      <baseParam name='UPPER_ENERGY_E180' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_e180_UPPER_ENERGY_E180[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml
deleted file mode 100644
index 89c6aaf..0000000
--- a/INTERNAL_PARAM_DEF/jade_e180_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e180_upper_energy_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:e180'>
-      <baseParam name='UPPER_ENERGY_E180' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_e180_UPPER_ENERGY_E180[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e300_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_energy.xml
new file mode 100644
index 0000000..a95cc46
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_e300_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="jade_e300_energy">
+  <get>	  
+    <vi name='juno:jade:e300'>
+      <baseParam name='ENERGY_E300' useNearestValue="true"/>
+    </vi>
+  </get>
+  <process/>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml
deleted file mode 100644
index 3ca2172..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e300_lower_energy_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:e300'>
-      <baseParam name='LOWER_ENERGY_E300' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_e300_LOWER_ENERGY_E300[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml
deleted file mode 100644
index 6c51f14..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e300_sum_lower_energy">
-  <get>	  
-    <vi name='juno:jade:e300'>
-      <baseParam name='LOWER_ENERGY_E300' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_e300_LOWER_ENERGY_E300[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml
deleted file mode 100644
index 0dfb726..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e300_sum_upper_energy">
-  <get>	  
-    <vi name='juno:jade:e300'>
-      <baseParam name='UPPER_ENERGY_E300' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_e300_UPPER_ENERGY_E300[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml
deleted file mode 100644
index 128b0b1..0000000
--- a/INTERNAL_PARAM_DEF/jade_e300_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e300_upper_energy_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:e300'>
-      <baseParam name='UPPER_ENERGY_E300' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_e300_UPPER_ENERGY_E300[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e60_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_energy.xml
new file mode 100644
index 0000000..cef52f5
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_e60_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="jade_e60_energy">
+  <get>	  
+    <vi name='juno:jade:e060'>
+      <baseParam name='ENERGY_E060' useNearestValue="true"/>
+    </vi>
+  </get>
+  <process/>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml
deleted file mode 100644
index 0d57049..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e60_lower_energy_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:e060'>
-      <baseParam name='LOWER_ENERGY_E060' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_e060_LOWER_ENERGY_E060[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml
deleted file mode 100644
index f8aa5c2..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e60_sum_lower_energy">
-  <get>	  
-    <vi name='juno:jade:e060'>
-      <baseParam name='LOWER_ENERGY_E060' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_e060_LOWER_ENERGY_E060[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml
deleted file mode 100644
index b51efad..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e60_sum_upper_energy">
-  <get>	  
-    <vi name='juno:jade:e060'>
-      <baseParam name='UPPER_ENERGY_E060' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_e060_UPPER_ENERGY_E060[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml
deleted file mode 100644
index 0b6b5ab..0000000
--- a/INTERNAL_PARAM_DEF/jade_e60_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_e60_upper_energy_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:e060'>
-      <baseParam name='UPPER_ENERGY_E060' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_e060_UPPER_ENERGY_E060[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_energy.xml
new file mode 100644
index 0000000..6c0776f
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jade_ispec_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<param xml:id="jade_ispec_energy">
+  <get>	  
+    <vi name='juno:jade:ions'>
+      <baseParam name='ENERGY' useNearestValue="true"/>
+    </vi>
+  </get>
+  <process/>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml
deleted file mode 100644
index 6e1696d..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_ispec_lower_energy_##species##_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:ions'>
-      <baseParam name='LOWER_ENERGY_##species##' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_ions_LOWER_ENERGY_##species##[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml
deleted file mode 100644
index 319c96a..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_sum_lower_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_ispec_sum_lower_energy_##species##">
-  <get>	  
-    <vi name='juno:jade:ions'>
-      <baseParam name='LOWER_ENERGY_##species##' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_ions_LOWER_ENERGY_##species##[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml
deleted file mode 100644
index be8f3dc..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_sum_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_ispec_sum_upper_energy_##species##">
-  <get>	  
-    <vi name='juno:jade:ions'>
-      <baseParam name='UPPER_ENERGY_##species##' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir 0">$juno_jade_ions_UPPER_ENERGY_##species##[0]</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml b/INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml
deleted file mode 100644
index 7b3ef60..0000000
--- a/INTERNAL_PARAM_DEF/jade_ispec_upper_energy.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<param xml:id="jade_ispec_upper_energy_##species##_##lookdir##">
-  <get>	  
-    <vi name='juno:jade:ions'>
-      <baseParam name='UPPER_ENERGY_##species##' useNearestValue="true"/>
-    </vi>
-  </get>
-  <process description="LookDir ##lookdir##">$juno_jade_ions_UPPER_ENERGY_##species##[##lookdir##]</process>
-  <output/>
-</param>
diff --git a/PARAM_DEF/jade_e180_cps.xml b/PARAM_DEF/jade_e180_cps.xml
index b903668..e9d2a7a 100644
--- a/PARAM_DEF/jade_e180_cps.xml
+++ b/PARAM_DEF/jade_e180_cps.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_e180_cps_##lookdir##">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e180_lower_energy_##lookdir##" maxName="jade_e180_upper_energy_##lookdir##"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e180_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:e180'>
       <baseParam name='DATA_E180' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_e180_lower_energy_##lookdir##"/>
-    <amdaParam name="jade_e180_upper_energy_##lookdir##"/>
+    <amdaParam name="jade_e180_energy"/>
   </get>
   <process description="LookDir ##lookdir##">$juno_jade_e180_DATA_E180[##lookdir##]</process>
   <output>
diff --git a/PARAM_DEF/jade_e180_cps_sum.xml b/PARAM_DEF/jade_e180_cps_sum.xml
index b5ccc58..74c85f3 100644
--- a/PARAM_DEF/jade_e180_cps_sum.xml
+++ b/PARAM_DEF/jade_e180_cps_sum.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_e180_cps_sum">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e180_sum_lower_energy" maxName="jade_e180_sum_upper_energy"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e180_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:e180'>
       <baseParam name='DATA_E180' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_e180_sum_lower_energy"/>
-    <amdaParam name="jade_e180_sum_upper_energy"/>
+    <amdaParam name="jade_e180_energy"/>
   </get>
   <process description="All Look Dir.">total($juno_jade_e180_DATA_E180,1)</process>
   <output>
diff --git a/PARAM_DEF/jade_e180_mode.xml b/PARAM_DEF/jade_e180_mode.xml
index 7331c1e..7741f33 100644
--- a/PARAM_DEF/jade_e180_mode.xml
+++ b/PARAM_DEF/jade_e180_mode.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <param xml:id='jade_e180_mode'>
+  <gap_threshold>100</gap_threshold>
   <get>
     <vi name='juno:jade:e180'>
            <baseParam name='Mode' useNearestValue="true"/>
diff --git a/PARAM_DEF/jade_e300_cps.xml b/PARAM_DEF/jade_e300_cps.xml
index a940748..7da931a 100644
--- a/PARAM_DEF/jade_e300_cps.xml
+++ b/PARAM_DEF/jade_e300_cps.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_e300_cps_##lookdir##">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e300_lower_energy_##lookdir##" maxName="jade_e300_upper_energy_##lookdir##"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e300_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:e300'>
       <baseParam name='DATA_E300' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_e300_lower_energy_##lookdir##"/>
-    <amdaParam name="jade_e300_upper_energy_##lookdir##"/>
+    <amdaParam name="jade_e300_energy"/>
   </get>
   <process description="LookDir ##lookdir##">$juno_jade_e300_DATA_E300[##lookdir##]</process>
   <output>
diff --git a/PARAM_DEF/jade_e300_cps_sum.xml b/PARAM_DEF/jade_e300_cps_sum.xml
index 7b1d157..be2f25b 100644
--- a/PARAM_DEF/jade_e300_cps_sum.xml
+++ b/PARAM_DEF/jade_e300_cps_sum.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_e300_cps_sum">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e300_sum_lower_energy" maxName="jade_e300_sum_upper_energy"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e300_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:e300'>
       <baseParam name='DATA_E300' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_e300_sum_lower_energy"/>
-    <amdaParam name="jade_e300_sum_upper_energy"/>
+    <amdaParam name="jade_e300_energy"/>
   </get>
   <process description="All Look Dir.">total($juno_jade_e300_DATA_E300,1)</process>
   <output>
diff --git a/PARAM_DEF/jade_e300_mode.xml b/PARAM_DEF/jade_e300_mode.xml
index fa734ca..a31dc0a 100644
--- a/PARAM_DEF/jade_e300_mode.xml
+++ b/PARAM_DEF/jade_e300_mode.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <param xml:id='jade_e300_mode'>
+  <gap_threshold>100</gap_threshold>
   <get>
     <vi name='juno:jade:e300'>
            <baseParam name='Mode' useNearestValue="true"/>
diff --git a/PARAM_DEF/jade_e60_cps.xml b/PARAM_DEF/jade_e60_cps.xml
index 97e2deb..555c3f8 100644
--- a/PARAM_DEF/jade_e60_cps.xml
+++ b/PARAM_DEF/jade_e60_cps.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_e60_cps_##lookdir##">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e60_lower_energy_##lookdir##" maxName="jade_e60_upper_energy_##lookdir##"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e60_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:e060'>
       <baseParam name='DATA_E060' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_e60_lower_energy_##lookdir##"/>
-    <amdaParam name="jade_e60_upper_energy_##lookdir##"/>
+    <amdaParam name="jade_e60_energy"/>
   </get>
   <process description="LookDir ##lookdir##">$juno_jade_e060_DATA_E060[##lookdir##]</process>
   <output>
diff --git a/PARAM_DEF/jade_e60_cps_sum.xml b/PARAM_DEF/jade_e60_cps_sum.xml
index 5d4f518..7548fac 100644
--- a/PARAM_DEF/jade_e60_cps_sum.xml
+++ b/PARAM_DEF/jade_e60_cps_sum.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_e60_cps_sum">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_e60_sum_lower_energy" maxName="jade_e60_sum_upper_energy"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_e60_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:e060'>
       <baseParam name='DATA_E060' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_e60_sum_lower_energy"/>
-    <amdaParam name="jade_e60_sum_upper_energy"/>
+    <amdaParam name="jade_e60_energy"/>
   </get>
   <process description="All Look Dir.">total($juno_jade_e060_DATA_E060,1)</process>
   <output>
diff --git a/PARAM_DEF/jade_e60_mode.xml b/PARAM_DEF/jade_e60_mode.xml
index 9cdc1f4..c75ac68 100644
--- a/PARAM_DEF/jade_e60_mode.xml
+++ b/PARAM_DEF/jade_e60_mode.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <param xml:id='jade_e60_mode'>
+  <gap_threshold>100</gap_threshold>
   <get>
     <vi name='juno:jade:e060'>
            <baseParam name='Mode' useNearestValue="true"/>
diff --git a/PARAM_DEF/jade_ispec_cps.xml b/PARAM_DEF/jade_ispec_cps.xml
index 69731fc..5b86aed 100644
--- a/PARAM_DEF/jade_ispec_cps.xml
+++ b/PARAM_DEF/jade_ispec_cps.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_ispec_cps_##species##_##lookdir##">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_ispec_lower_energy_##species##_##lookdir##" maxName="jade_ispec_upper_energy_##species##_##lookdir##"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_ispec_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:ions'>
       <baseParam name='DATA_##species##' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_ispec_lower_energy_##species##_##lookdir##"/>
-    <amdaParam name="jade_ispec_upper_energy_##species##_##lookdir##"/>
+    <amdaParam name="jade_ispec_energy"/>
   </get>
   <process description="LookDir ##lookdir##">$juno_jade_ions_DATA_##species##[##lookdir##]</process>
   <output>
diff --git a/PARAM_DEF/jade_ispec_cps_sum.xml b/PARAM_DEF/jade_ispec_cps_sum.xml
index 455dc71..e5e5f4a 100644
--- a/PARAM_DEF/jade_ispec_cps_sum.xml
+++ b/PARAM_DEF/jade_ispec_cps_sum.xml
@@ -2,15 +2,15 @@
 <param xml:id="jade_ispec_cps_sum_##species##">
   <info>
         <table>
-                <minMaxTable variable="true" fullVariable="true" name="Energy" units="eV" minName="jade_ispec_sum_lower_energy_##species##" maxName="jade_ispec_sum_upper_energy_##species##"/>
+                <centerAutoTable variable="true" fullVariable="true" name="Energy" units="eV" centerName="jade_ispec_energy" log="true"/>
         </table>
   </info>
+  <gap_threshold>100</gap_threshold>
   <get>	  
     <vi name='juno:jade:ions'>
       <baseParam name='DATA_##species##' useNearestValue="true"/>
     </vi>
-    <amdaParam name="jade_ispec_sum_lower_energy_##species##"/>
-    <amdaParam name="jade_ispec_sum_upper_energy_##species##"/>
+    <amdaParam name="jade_ispec_energy"/>
   </get>
   <process description="LookDir ##lookdir##">total($juno_jade_ions_DATA_##species##,1)</process>
   <output>
diff --git a/PARAM_DEF/jade_ispec_mode.xml b/PARAM_DEF/jade_ispec_mode.xml
index 7c25130..d9f1a84 100644
--- a/PARAM_DEF/jade_ispec_mode.xml
+++ b/PARAM_DEF/jade_ispec_mode.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <param xml:id='jade_ispec_mode'>
+  <gap_threshold>100</gap_threshold>
   <get>
     <vi name='juno:jade:ions'>
            <baseParam name='Mode' useNearestValue="true"/>
--
libgit2 0.21.2