From c449102e416b1ba96424fa945e67b3d3baab9e86 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Thu, 8 Jul 2021 09:26:10 +0200
Subject: [PATCH] Merge JASON3 AMBRE from amdadev

---
 INTERNAL_PARAM_DEF/jason_amb_ele_conf.xml     | 15 +++++++++++++++
 INTERNAL_PARAM_DEF/jason_amb_ele_enmax.xml    |  8 ++++++++
 INTERNAL_PARAM_DEF/jason_amb_ele_enmin.xml    |  8 ++++++++
 INTERNAL_PARAM_DEF/jason_amb_ion_conf.xml     | 15 +++++++++++++++
 INTERNAL_PARAM_DEF/jason_amb_ion_enmax.xml    |  8 ++++++++
 INTERNAL_PARAM_DEF/jason_amb_ion_enmin.xml    |  8 ++++++++
 PARAM_DEF/jason_amb_b.xml                     |  2 +-
 PARAM_DEF/jason_amb_beq.xml                   |  2 +-
 PARAM_DEF/jason_amb_ect1.xml                  | 34 ++++++++++++++++++++++++++++++++++
 PARAM_DEF/jason_amb_ect1234.xml               | 34 ++++++++++++++++++++++++++++++++++
 PARAM_DEF/jason_amb_ect2.xml                  | 34 ++++++++++++++++++++++++++++++++++
 PARAM_DEF/jason_amb_ect3.xml                  | 34 ++++++++++++++++++++++++++++++++++
 PARAM_DEF/jason_amb_ect4.xml                  | 34 ++++++++++++++++++++++++++++++++++
 PARAM_DEF/jason_amb_epa1.xml                  | 10 ++++++++++
 PARAM_DEF/jason_amb_epa2.xml                  | 10 ++++++++++
 PARAM_DEF/jason_amb_epa3.xml                  | 10 ++++++++++
 PARAM_DEF/jason_amb_epa4.xml                  | 10 ++++++++++
 PARAM_DEF/jason_amb_epaeq1.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_epaeq2.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_epaeq3.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_epaeq4.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_ict1.xml                  |  8 ++++----
 PARAM_DEF/jason_amb_ict1234.xml               | 34 ++++++++++++++++++++++++++++++++++
 PARAM_DEF/jason_amb_ict2.xml                  |  8 ++++----
 PARAM_DEF/jason_amb_ict3.xml                  |  8 ++++----
 PARAM_DEF/jason_amb_ict4.xml                  |  8 ++++----
 PARAM_DEF/jason_amb_ipa1.xml                  |  2 +-
 PARAM_DEF/jason_amb_ipa2.xml                  |  2 +-
 PARAM_DEF/jason_amb_ipa3.xml                  |  2 +-
 PARAM_DEF/jason_amb_ipa4.xml                  |  2 +-
 PARAM_DEF/jason_amb_ipaeq1.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_ipaeq2.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_ipaeq3.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_ipaeq4.xml                | 10 ++++++++++
 PARAM_DEF/jason_amb_mlt.xml                   | 10 ++++++++++
 PARAM_DEF/jason_amb_xyz.xml                   |  2 +-
 PARAM_INFO_PREDEFINED/info_jason_amb_ect1.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ect2.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ect3.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ect4.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ict1.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ict2.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ict3.xml |  8 ++++++++
 PARAM_INFO_PREDEFINED/info_jason_amb_ict4.xml |  8 ++++++++
 44 files changed, 483 insertions(+), 23 deletions(-)
 create mode 100644 INTERNAL_PARAM_DEF/jason_amb_ele_conf.xml
 create mode 100644 INTERNAL_PARAM_DEF/jason_amb_ele_enmax.xml
 create mode 100644 INTERNAL_PARAM_DEF/jason_amb_ele_enmin.xml
 create mode 100644 INTERNAL_PARAM_DEF/jason_amb_ion_conf.xml
 create mode 100644 INTERNAL_PARAM_DEF/jason_amb_ion_enmax.xml
 create mode 100644 INTERNAL_PARAM_DEF/jason_amb_ion_enmin.xml
 create mode 100644 PARAM_DEF/jason_amb_ect1.xml
 create mode 100644 PARAM_DEF/jason_amb_ect1234.xml
 create mode 100644 PARAM_DEF/jason_amb_ect2.xml
 create mode 100644 PARAM_DEF/jason_amb_ect3.xml
 create mode 100644 PARAM_DEF/jason_amb_ect4.xml
 create mode 100644 PARAM_DEF/jason_amb_epa1.xml
 create mode 100644 PARAM_DEF/jason_amb_epa2.xml
 create mode 100644 PARAM_DEF/jason_amb_epa3.xml
 create mode 100644 PARAM_DEF/jason_amb_epa4.xml
 create mode 100644 PARAM_DEF/jason_amb_epaeq1.xml
 create mode 100644 PARAM_DEF/jason_amb_epaeq2.xml
 create mode 100644 PARAM_DEF/jason_amb_epaeq3.xml
 create mode 100644 PARAM_DEF/jason_amb_epaeq4.xml
 create mode 100644 PARAM_DEF/jason_amb_ict1234.xml
 create mode 100644 PARAM_DEF/jason_amb_ipaeq1.xml
 create mode 100644 PARAM_DEF/jason_amb_ipaeq2.xml
 create mode 100644 PARAM_DEF/jason_amb_ipaeq3.xml
 create mode 100644 PARAM_DEF/jason_amb_ipaeq4.xml
 create mode 100644 PARAM_DEF/jason_amb_mlt.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ect1.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ect2.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ect3.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ect4.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ict1.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ict2.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ict3.xml
 create mode 100644 PARAM_INFO_PREDEFINED/info_jason_amb_ict4.xml

diff --git a/INTERNAL_PARAM_DEF/jason_amb_ele_conf.xml b/INTERNAL_PARAM_DEF/jason_amb_ele_conf.xml
new file mode 100644
index 0000000..1e18ae6
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jason_amb_ele_conf.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ele_conf">
+	<get>
+		<vi name="jason:amb:ele">
+		<baseParam name="config" useNearestValue="true">
+			<clb name="Eelec_32E_MIN"/>
+                        <clb name="Eelec_16E_MIN"/>
+                        <clb name="Eelec_32E_MAX"/>
+                        <clb name="Eelec_16E_MAX"/>
+		</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jason_amb_ele_enmax.xml b/INTERNAL_PARAM_DEF/jason_amb_ele_enmax.xml
new file mode 100644
index 0000000..235ce7a
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jason_amb_ele_enmax.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ele_enmax">
+	<get>
+                <amdaParam name="jason_amb_ele_conf"/>
+	</get>
+	<process>#getClbInfo($jason_amb_ele_conf;1:Eelec_32E_MAX;2:Eelec_32E_MAX;3:Eelec_16E_MAX)</process>
+	<output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jason_amb_ele_enmin.xml b/INTERNAL_PARAM_DEF/jason_amb_ele_enmin.xml
new file mode 100644
index 0000000..1a7eabc
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jason_amb_ele_enmin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ele_enmin">
+	<get>
+                <amdaParam name="jason_amb_ele_conf"/>
+	</get>
+	<process>#getClbInfo($jason_amb_ele_conf;1:Eelec_32E_MIN;2:Eelec_32E_MIN;3:Eelec_16E_MIN)</process>
+	<output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jason_amb_ion_conf.xml b/INTERNAL_PARAM_DEF/jason_amb_ion_conf.xml
new file mode 100644
index 0000000..c60de40
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jason_amb_ion_conf.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ion_conf">
+	<get>
+		<vi name="jason:amb:ion">
+		<baseParam name="config" useNearestValue="true">
+			<clb name="Eion_32E_MIN"/>
+                        <clb name="Eion_16E_MIN"/>
+                        <clb name="Eion_32E_MAX"/>
+                        <clb name="Eion_16E_MAX"/>
+		</baseParam>
+		</vi>
+	</get>
+	<process/>
+	<output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jason_amb_ion_enmax.xml b/INTERNAL_PARAM_DEF/jason_amb_ion_enmax.xml
new file mode 100644
index 0000000..ef72ed0
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jason_amb_ion_enmax.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ion_enmax">
+	<get>
+                <amdaParam name="jason_amb_ion_conf"/>
+	</get>
+	<process>#getClbInfo($jason_amb_ion_conf;1:Eion_32E_MAX;2:Eion_32E_MAX;3:Eion_16E_MAX)</process>
+	<output/>
+</param>
diff --git a/INTERNAL_PARAM_DEF/jason_amb_ion_enmin.xml b/INTERNAL_PARAM_DEF/jason_amb_ion_enmin.xml
new file mode 100644
index 0000000..ebfcc6c
--- /dev/null
+++ b/INTERNAL_PARAM_DEF/jason_amb_ion_enmin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ion_enmin">
+	<get>
+                <amdaParam name="jason_amb_ion_conf"/>
+	</get>
+	<process>#getClbInfo($jason_amb_ion_conf;1:Eion_32E_MIN;2:Eion_32E_MIN;3:Eion_16E_MIN)</process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_b.xml b/PARAM_DEF/jason_amb_b.xml
index f7ef29f..fa73256 100644
--- a/PARAM_DEF/jason_amb_b.xml
+++ b/PARAM_DEF/jason_amb_b.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_b">
 	<get>
 		<vi name="jason:amb:mag">
-			<baseParam name="B"/>
+			<baseParam name="B_Calc"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_DEF/jason_amb_beq.xml b/PARAM_DEF/jason_amb_beq.xml
index 001afbb..fb348c4 100644
--- a/PARAM_DEF/jason_amb_beq.xml
+++ b/PARAM_DEF/jason_amb_beq.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_beq">
 	<get>
 		<vi name="jason:amb:mag">
-			<baseParam name="B_eq"/>
+			<baseParam name="B_Eq"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_DEF/jason_amb_ect1.xml b/PARAM_DEF/jason_amb_ect1.xml
new file mode 100644
index 0000000..87995f7
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ect1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ect1">
+    <info>        
+        <table>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
+        </table>
+    </info>
+    <get><vi name="jason:amb:ele">
+		    <baseParam name="CountRate_ELE1"/>
+            </vi>
+        <amdaParam name="jason_amb_ele_enmin"/>
+        <amdaParam name="jason_amb_ele_enmax"/>
+    </get>
+    <process/>
+    <output> 
+        <plot>
+            <timePlot>
+                <params>
+                    <param id="jason_amb_ect1">
+                        <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/jason_amb_ect1234.xml b/PARAM_DEF/jason_amb_ect1234.xml
new file mode 100644
index 0000000..6ce4ba4
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ect1234.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ect1234">
+    <info>        
+        <table>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
+        </table>
+    </info>
+    <get>
+        <amdaParam name="jason_amb_ect1"/>
+        <amdaParam name="jason_amb_ect2"/>
+        <amdaParam name="jason_amb_ect3"/>
+        <amdaParam name="jason_amb_ect4"/>
+    </get>
+    <process>($jason_amb_ect1+$jason_amb_ect2+$jason_amb_ect3+$jason_amb_ect4)/4.</process>
+    <output> 
+        <plot>
+            <timePlot>
+                <params>
+                    <param id="jason_amb_ect1234">
+                        <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/jason_amb_ect2.xml b/PARAM_DEF/jason_amb_ect2.xml
new file mode 100644
index 0000000..a153b61
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ect2.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ect2">
+    <info>        
+        <table>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
+        </table>
+    </info>
+    <get><vi name="jason:amb:ele">
+		    <baseParam name="CountRate_ELE2"/>
+            </vi>
+        <amdaParam name="jason_amb_ele_enmin"/>
+        <amdaParam name="jason_amb_ele_enmax"/>
+    </get>
+    <process/>
+    <output> 
+        <plot>
+            <timePlot>
+                <params>
+                    <param id="jason_amb_ect2">
+                        <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/jason_amb_ect3.xml b/PARAM_DEF/jason_amb_ect3.xml
new file mode 100644
index 0000000..5ee1437
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ect3.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ect3">
+    <info>        
+        <table>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
+        </table>
+    </info>
+    <get><vi name="jason:amb:ele">
+		    <baseParam name="CountRate_ELE3"/>
+            </vi>
+        <amdaParam name="jason_amb_ele_enmin"/>
+        <amdaParam name="jason_amb_ele_enmax"/>
+    </get>
+    <process/>
+    <output> 
+        <plot>
+            <timePlot>
+                <params>
+                    <param id="jason_amb_ect3">
+                        <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/jason_amb_ect4.xml b/PARAM_DEF/jason_amb_ect4.xml
new file mode 100644
index 0000000..50cc494
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ect4.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ect4">
+    <info>        
+        <table>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ele_enmin" maxName="jason_amb_ele_enmax"/>
+        </table>
+    </info>
+    <get><vi name="jason:amb:ele">
+		    <baseParam name="CountRate_ELE4"/>
+            </vi>
+        <amdaParam name="jason_amb_ele_enmin"/>
+        <amdaParam name="jason_amb_ele_enmax"/>
+    </get>
+    <process/>
+    <output> 
+        <plot>
+            <timePlot>
+                <params>
+                    <param id="jason_amb_ect4">
+                        <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/jason_amb_epa1.xml b/PARAM_DEF/jason_amb_epa1.xml
new file mode 100644
index 0000000..1e23a39
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epa1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epa1">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE1"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epa2.xml b/PARAM_DEF/jason_amb_epa2.xml
new file mode 100644
index 0000000..9e21ba5
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epa2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epa2">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE2"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epa3.xml b/PARAM_DEF/jason_amb_epa3.xml
new file mode 100644
index 0000000..6112b2c
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epa3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epa3">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE3"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epa4.xml b/PARAM_DEF/jason_amb_epa4.xml
new file mode 100644
index 0000000..6b44cea
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epa4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epa4">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE4"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epaeq1.xml b/PARAM_DEF/jason_amb_epaeq1.xml
new file mode 100644
index 0000000..fba6e91
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epaeq1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epaeq1">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE1_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epaeq2.xml b/PARAM_DEF/jason_amb_epaeq2.xml
new file mode 100644
index 0000000..1874f02
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epaeq2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epaeq2">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE2_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epaeq3.xml b/PARAM_DEF/jason_amb_epaeq3.xml
new file mode 100644
index 0000000..c60f0e3
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epaeq3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epaeq3">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE3_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_epaeq4.xml b/PARAM_DEF/jason_amb_epaeq4.xml
new file mode 100644
index 0000000..48fa12f
--- /dev/null
+++ b/PARAM_DEF/jason_amb_epaeq4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_epaeq4">
+	<get>
+		<vi name="jason:amb:ele">
+			<baseParam name="Alpha_ELE4_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_ict1.xml b/PARAM_DEF/jason_amb_ict1.xml
index e86a984..03f0bad 100644
--- a/PARAM_DEF/jason_amb_ict1.xml
+++ b/PARAM_DEF/jason_amb_ict1.xml
@@ -2,14 +2,14 @@
 <param xml:id="jason_amb_ict1">
     <info>        
         <table>
-                <boundsTable name="Energy" units="eV" boundsName="Energybounds"/>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/>
         </table>
     </info>
     <get><vi name="jason:amb:ion">
-		    <baseParam name="ct_ion1">
-			    <clb name="Energybounds"/>
-		    </baseParam>
+		    <baseParam name="CountRate_ION1"/>
             </vi>
+            <amdaParam name="jason_amb_ion_enmin"/>
+            <amdaParam name="jason_amb_ion_enmax"/>
     </get>
     <process/>
     <output> 
diff --git a/PARAM_DEF/jason_amb_ict1234.xml b/PARAM_DEF/jason_amb_ict1234.xml
new file mode 100644
index 0000000..ae26c7e
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ict1234.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ict1234">
+    <info>        
+        <table>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/>
+        </table>
+    </info>
+    <get>
+        <amdaParam name="jason_amb_ict1"/>
+        <amdaParam name="jason_amb_ict2"/>
+        <amdaParam name="jason_amb_ict3"/>
+        <amdaParam name="jason_amb_ict4"/>
+    </get>
+    <process>($jason_amb_ict1+$jason_amb_ict2+$jason_amb_ict3+$jason_amb_ict4)/4.</process>
+    <output> 
+        <plot>
+            <timePlot>
+                <params>
+                    <param id="jason_amb_ict1234">
+                        <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/jason_amb_ict2.xml b/PARAM_DEF/jason_amb_ict2.xml
index fae2c28..8aaf04b 100644
--- a/PARAM_DEF/jason_amb_ict2.xml
+++ b/PARAM_DEF/jason_amb_ict2.xml
@@ -2,14 +2,14 @@
 <param xml:id="jason_amb_ict2">
     <info>        
         <table>
-                <boundsTable name="Energy" units="eV" boundsName="Energybounds"/>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/>
         </table>
     </info>
     <get><vi name="jason:amb:ion">
-		    <baseParam name="ct_ion2">
-			    <clb name="Energybounds"/>
-		    </baseParam>
+		    <baseParam name="CountRate_ION2"/>
             </vi>
+            <amdaParam name="jason_amb_ion_enmin"/>
+            <amdaParam name="jason_amb_ion_enmax"/>
     </get>
     <process/>
     <output> 
diff --git a/PARAM_DEF/jason_amb_ict3.xml b/PARAM_DEF/jason_amb_ict3.xml
index 5d8240e..961ce59 100644
--- a/PARAM_DEF/jason_amb_ict3.xml
+++ b/PARAM_DEF/jason_amb_ict3.xml
@@ -2,14 +2,14 @@
 <param xml:id="jason_amb_ict3">
     <info>        
         <table>
-                <boundsTable name="Energy" units="eV" boundsName="Energybounds"/>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/>
         </table>
     </info>
     <get><vi name="jason:amb:ion">
-		    <baseParam name="ct_ion3">
-			    <clb name="Energybounds"/>
-		    </baseParam>
+		    <baseParam name="CountRate_ION3"/>
             </vi>
+            <amdaParam name="jason_amb_ion_enmin"/>
+            <amdaParam name="jason_amb_ion_enmax"/>
     </get>
     <process/>
     <output> 
diff --git a/PARAM_DEF/jason_amb_ict4.xml b/PARAM_DEF/jason_amb_ict4.xml
index 90f6bae..d89b348 100644
--- a/PARAM_DEF/jason_amb_ict4.xml
+++ b/PARAM_DEF/jason_amb_ict4.xml
@@ -2,14 +2,14 @@
 <param xml:id="jason_amb_ict4">
     <info>        
         <table>
-                <boundsTable name="Energy" units="eV" boundsName="Energybounds"/>
+                <minMaxTable variable="true" name="Energy" units="eV" minName="jason_amb_ion_enmin" maxName="jason_amb_ion_enmax"/>
         </table>
     </info>
     <get><vi name="jason:amb:ion">
-		    <baseParam name="ct_ion4">
-			    <clb name="Energybounds"/>
-		    </baseParam>
+		    <baseParam name="CountRate_ION4"/>
             </vi>
+            <amdaParam name="jason_amb_ion_enmin"/>
+            <amdaParam name="jason_amb_ion_enmax"/>
     </get>
     <process/>
     <output> 
diff --git a/PARAM_DEF/jason_amb_ipa1.xml b/PARAM_DEF/jason_amb_ipa1.xml
index 3bf064a..a10cdf7 100644
--- a/PARAM_DEF/jason_amb_ipa1.xml
+++ b/PARAM_DEF/jason_amb_ipa1.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_ipa1">
 	<get>
 		<vi name="jason:amb:ion">
-			<baseParam name="pa_ion1_eq"/>
+			<baseParam name="Alpha_ION1"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_DEF/jason_amb_ipa2.xml b/PARAM_DEF/jason_amb_ipa2.xml
index f8d849a..f3b7d0f 100644
--- a/PARAM_DEF/jason_amb_ipa2.xml
+++ b/PARAM_DEF/jason_amb_ipa2.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_ipa2">
 	<get>
 		<vi name="jason:amb:ion">
-			<baseParam name="pa_ion2_eq"/>
+			<baseParam name="Alpha_ION2"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_DEF/jason_amb_ipa3.xml b/PARAM_DEF/jason_amb_ipa3.xml
index f08d057..bd5c155 100644
--- a/PARAM_DEF/jason_amb_ipa3.xml
+++ b/PARAM_DEF/jason_amb_ipa3.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_ipa3">
 	<get>
 		<vi name="jason:amb:ion">
-			<baseParam name="pa_ion3_eq"/>
+			<baseParam name="Alpha_ION3"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_DEF/jason_amb_ipa4.xml b/PARAM_DEF/jason_amb_ipa4.xml
index 027be1c..3b50cdb 100644
--- a/PARAM_DEF/jason_amb_ipa4.xml
+++ b/PARAM_DEF/jason_amb_ipa4.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_ipa4">
 	<get>
 		<vi name="jason:amb:ion">
-			<baseParam name="pa_ion4_eq"/>
+			<baseParam name="Alpha_ION4"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_DEF/jason_amb_ipaeq1.xml b/PARAM_DEF/jason_amb_ipaeq1.xml
new file mode 100644
index 0000000..a1c6759
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ipaeq1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ipaeq1">
+	<get>
+		<vi name="jason:amb:ion">
+			<baseParam name="Alpha_ION1_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_ipaeq2.xml b/PARAM_DEF/jason_amb_ipaeq2.xml
new file mode 100644
index 0000000..5af8c1f
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ipaeq2.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ipaeq2">
+	<get>
+		<vi name="jason:amb:ion">
+			<baseParam name="Alpha_ION2_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_ipaeq3.xml b/PARAM_DEF/jason_amb_ipaeq3.xml
new file mode 100644
index 0000000..5c5dd13
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ipaeq3.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ipaeq3">
+	<get>
+		<vi name="jason:amb:ion">
+			<baseParam name="Alpha_ION3_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_ipaeq4.xml b/PARAM_DEF/jason_amb_ipaeq4.xml
new file mode 100644
index 0000000..5eb93a7
--- /dev/null
+++ b/PARAM_DEF/jason_amb_ipaeq4.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_ipaeq4">
+	<get>
+		<vi name="jason:amb:ion">
+			<baseParam name="Alpha_ION4_Eq"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_mlt.xml b/PARAM_DEF/jason_amb_mlt.xml
new file mode 100644
index 0000000..3ba3744
--- /dev/null
+++ b/PARAM_DEF/jason_amb_mlt.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<param xml:id="jason_amb_mlt">
+	<get>
+		<vi name="jason:amb:pos">
+			<baseParam name="MLT"/>
+		</vi>
+	</get>
+	<process></process>
+	<output/>
+</param>
diff --git a/PARAM_DEF/jason_amb_xyz.xml b/PARAM_DEF/jason_amb_xyz.xml
index 1e4c720..2115555 100644
--- a/PARAM_DEF/jason_amb_xyz.xml
+++ b/PARAM_DEF/jason_amb_xyz.xml
@@ -2,7 +2,7 @@
 <param xml:id="jason_amb_xyz">
 	<get>
 		<vi name="jason:amb:pos">
-			<baseParam name="POS_GEO"/>
+			<baseParam name="Position"/>
 		</vi>
 	</get>
 	<process></process>
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ect1.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ect1.xml
new file mode 100644
index 0000000..8726c0b
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ect1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ect1">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="27648" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ect2.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ect2.xml
new file mode 100644
index 0000000..aab5c7b
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ect2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ect2">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="27648" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ect3.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ect3.xml
new file mode 100644
index 0000000..7ecd0ae
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ect3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ect3">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="27648" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ect4.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ect4.xml
new file mode 100644
index 0000000..7c9e8c3
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ect4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ect4">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="27648" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ict1.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ict1.xml
new file mode 100644
index 0000000..5fc9d82
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ict1.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ict1">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="29440" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ict2.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ict2.xml
new file mode 100644
index 0000000..7d848ed
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ict2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ict2">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="29440" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ict3.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ict3.xml
new file mode 100644
index 0000000..eab00f7
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ict3.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ict3">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="29440" variable="true"/>
+	</tables>
+</paraminfo>
+ 
diff --git a/PARAM_INFO_PREDEFINED/info_jason_amb_ict4.xml b/PARAM_INFO_PREDEFINED/info_jason_amb_ict4.xml
new file mode 100644
index 0000000..8048e02
--- /dev/null
+++ b/PARAM_INFO_PREDEFINED/info_jason_amb_ict4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paraminfo id="jason_amb_ict4">
+	<dimensions dim_1="32"/>
+	<tables>
+		<table relatedDim="dim_1" name="Energy" units="eV" minValue="10" maxValue="29440" variable="true"/>
+	</tables>
+</paraminfo>
+ 
--
libgit2 0.21.2