From 0b2c313f8800b91d1163a620761a5c9d3a7d70fe Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Fri, 17 Mar 2023 07:04:01 +0000
Subject: [PATCH] Fix JUNO/JEDI Ions energy tables

---
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy.xml   | 10 ++++++++++
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_0.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_1.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_2.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_3.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_4.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_5.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy.xml   | 10 ++++++++++
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_0.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_1.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_2.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_3.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_4.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_5.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy.xml   | 10 ++++++++++
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_0.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_1.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_2.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_3.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_4.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_5.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy.xml   | 10 ++++++++++
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_0.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_1.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_2.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_3.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_4.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_5.xml |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy.xml    | 10 ++++++++++
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_0.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_1.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_2.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_3.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_4.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_5.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy.xml    | 10 ++++++++++
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_0.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_1.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_2.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_3.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_4.xml  |  8 --------
 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_5.xml  |  8 --------
 42 files changed, 60 insertions(+), 288 deletions(-)
 create mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_0.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_1.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_2.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_3.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_4.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_lower_energy_5.xml
 create mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_0.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_1.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_2.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_3.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_4.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i180_upper_energy_5.xml
 create mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_0.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_1.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_2.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_3.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_4.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_lower_energy_5.xml
 create mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_0.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_1.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_2.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_3.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_4.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i270_upper_energy_5.xml
 create mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_0.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_1.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_2.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_3.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_4.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_lower_energy_5.xml
 create mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_0.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_1.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_2.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_3.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_4.xml
 delete mode 100644 INTERNAL_PARAM_DEF/jedi_i90_upper_energy_5.xml

diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy.xml
new file mode 100644
index 0000000..e1f5afa
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jedi_i180_lower_energy_##lookdir##">
+  <get>
+        <vi name='juno:jedi:i180'>
+                <baseParam name='LowerEnergy'/>
+        </vi>
+  </get>
+  <process>$juno_jedi_i180_LowerEnergy[##lookdir##]</process>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_0.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_0.xml
deleted file mode 100644
index 37c4420..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_lower_energy_0">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_i180_mode;0)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_1.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_1.xml
deleted file mode 100644
index 02bec34..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_lower_energy_1">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_i180_mode;1)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_2.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_2.xml
deleted file mode 100644
index 93ebee6..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_lower_energy_2">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_i180_mode;2)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_3.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_3.xml
deleted file mode 100644
index 85958d6..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_lower_energy_3">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_i180_mode;3)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_4.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_4.xml
deleted file mode 100644
index 0fc0478..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_lower_energy_4">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_i180_mode;4)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_5.xml b/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_5.xml
deleted file mode 100644
index 692afc3..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_lower_energy_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_lower_energy_5">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_i180_mode;5)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy.xml
new file mode 100644
index 0000000..229feb7
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jedi_i180_upper_energy_##lookdir##">
+  <get>
+        <vi name='juno:jedi:i180'>
+                <baseParam name='UpperEnergy'/>
+        </vi>
+  </get>
+  <process>$juno_jedi_i180_UpperEnergy[##lookdir##]</process>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_0.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_0.xml
deleted file mode 100644
index 2b4ce05..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_upper_energy_0">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 0">#getJunoJediUpperEnergy($jedi_i180_mode;0)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_1.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_1.xml
deleted file mode 100644
index 7c11b43..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_upper_energy_1">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 1">#getJunoJediUpperEnergy($jedi_i180_mode;1)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_2.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_2.xml
deleted file mode 100644
index 1130fd5..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_upper_energy_2">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 2">#getJunoJediUpperEnergy($jedi_i180_mode;2)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_3.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_3.xml
deleted file mode 100644
index e8c8577..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_upper_energy_3">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 3">#getJunoJediUpperEnergy($jedi_i180_mode;3)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_4.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_4.xml
deleted file mode 100644
index 18181d2..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_upper_energy_4">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 4">#getJunoJediUpperEnergy($jedi_i180_mode;4)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_5.xml b/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_5.xml
deleted file mode 100644
index 765579a..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i180_upper_energy_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i180_upper_energy_5">
-  <get>
-	<amdaParam name="jedi_i180_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 5">#getJunoJediUpperEnergy($jedi_i180_mode;5)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy.xml
new file mode 100644
index 0000000..3b41e1e
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jedi_i270_lower_energy_##lookdir##">
+  <get>
+        <vi name='juno:jedi:i270'>
+                <baseParam name='LowerEnergy'/>
+        </vi>
+  </get>
+  <process>$juno_jedi_i270_LowerEnergy[##lookdir##]</process>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_0.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_0.xml
deleted file mode 100644
index 6aadc07..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_lower_energy_0">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_i270_mode;0)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_1.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_1.xml
deleted file mode 100644
index df88d84..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_lower_energy_1">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_i270_mode;1)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_2.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_2.xml
deleted file mode 100644
index 90abd21..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_lower_energy_2">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_i270_mode;2)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_3.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_3.xml
deleted file mode 100644
index 5bcc002..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_lower_energy_3">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_i270_mode;3)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_4.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_4.xml
deleted file mode 100644
index 2800bc2..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_lower_energy_4">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_i270_mode;4)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_5.xml b/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_5.xml
deleted file mode 100644
index 89e09fc..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_lower_energy_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_lower_energy_5">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_i270_mode;5)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy.xml
new file mode 100644
index 0000000..a8db63e
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jedi_i270_upper_energy_##lookdir##">
+  <get>
+        <vi name='juno:jedi:i270'>
+                <baseParam name='UpperEnergy'/>
+        </vi>
+  </get>
+  <process>$juno_jedi_i270_UpperEnergy[##lookdir##]</process>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_0.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_0.xml
deleted file mode 100644
index 8a578fd..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_upper_energy_0">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 0">#getJunoJediUpperEnergy($jedi_i270_mode;0)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_1.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_1.xml
deleted file mode 100644
index 7147622..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_upper_energy_1">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 1">#getJunoJediUpperEnergy($jedi_i270_mode;1)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_2.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_2.xml
deleted file mode 100644
index ec74e67..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_upper_energy_2">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 2">#getJunoJediUpperEnergy($jedi_i270_mode;2)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_3.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_3.xml
deleted file mode 100644
index 4ece84d..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_upper_energy_3">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 3">#getJunoJediUpperEnergy($jedi_i270_mode;3)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_4.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_4.xml
deleted file mode 100644
index f5a06bd..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_upper_energy_4">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 4">#getJunoJediUpperEnergy($jedi_i270_mode;4)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_5.xml b/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_5.xml
deleted file mode 100644
index 09caa53..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i270_upper_energy_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i270_upper_energy_5">
-  <get>
-	<amdaParam name="jedi_i270_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 5">#getJunoJediUpperEnergy($jedi_i270_mode;5)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy.xml
new file mode 100644
index 0000000..befd3d1
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jedi_i90_lower_energy_##lookdir##">
+  <get>
+        <vi name='juno:jedi:i090'>
+                <baseParam name='LowerEnergy'/>
+        </vi>
+  </get>
+  <process>$juno_jedi_i090_LowerEnergy[##lookdir##]</process>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_0.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_0.xml
deleted file mode 100644
index c61cba7..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_lower_energy_0">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 0">#getJunoJediLowerEnergy($jedi_i90_mode;0)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_1.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_1.xml
deleted file mode 100644
index dba6f84..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_lower_energy_1">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 1">#getJunoJediLowerEnergy($jedi_i90_mode;1)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_2.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_2.xml
deleted file mode 100644
index f60c5f7..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_lower_energy_2">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 2">#getJunoJediLowerEnergy($jedi_i90_mode;2)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_3.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_3.xml
deleted file mode 100644
index 9f38d19..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_lower_energy_3">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 3">#getJunoJediLowerEnergy($jedi_i90_mode;3)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_4.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_4.xml
deleted file mode 100644
index 335c4c8..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_lower_energy_4">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 4">#getJunoJediLowerEnergy($jedi_i90_mode;4)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_5.xml b/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_5.xml
deleted file mode 100644
index 96acff2..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_lower_energy_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_lower_energy_5">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Lower energy for LookDir 5">#getJunoJediLowerEnergy($jedi_i90_mode;5)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy.xml
new file mode 100644
index 0000000..fa2ecc2
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jedi_i90_upper_energy_##lookdir##">
+  <get>
+        <vi name='juno:jedi:i090'>
+                <baseParam name='UpperEnergy'/>
+        </vi>
+  </get>
+  <process>$juno_jedi_i090_UpperEnergy[##lookdir##]</process>
+  <output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_0.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_0.xml
deleted file mode 100644
index fd0d670..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_upper_energy_0">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 0">#getJunoJediUpperEnergy($jedi_i90_mode;0)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_1.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_1.xml
deleted file mode 100644
index cd28453..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_upper_energy_1">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 1">#getJunoJediUpperEnergy($jedi_i90_mode;1)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_2.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_2.xml
deleted file mode 100644
index 0e9c78a..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_upper_energy_2">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 2">#getJunoJediUpperEnergy($jedi_i90_mode;2)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_3.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_3.xml
deleted file mode 100644
index 4e6ee33..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_upper_energy_3">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 3">#getJunoJediUpperEnergy($jedi_i90_mode;3)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_4.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_4.xml
deleted file mode 100644
index fd54671..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_upper_energy_4">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 4">#getJunoJediUpperEnergy($jedi_i90_mode;4)</process>
-  <output/>
-</param>
diff --git a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_5.xml b/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_5.xml
deleted file mode 100644
index e06190f..0000000
--- a/INTERNAL_PARAM_DEF/jedi_i90_upper_energy_5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<param xml:id="jedi_i90_upper_energy_5">
-  <get>
-	<amdaParam name="jedi_i90_mode"/>
-  </get>
-  <process description="Upper energy for LookDir 5">#getJunoJediUpperEnergy($jedi_i90_mode;5)</process>
-  <output/>
-</param>
--
libgit2 0.21.2