From c8d23bcb87a652a9722ff5a6be8f11ed9dcd6186 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Thu, 6 Aug 2020 09:37:02 +0200
Subject: [PATCH] Fix b_jrm09_can templated params

---
 PARAM_DEF/b_jrm09_can.xml     | 2 +-
 PARAM_DEF/b_jrm09_can_tot.xml | 2 +-
 ParamTemplateList.xml         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PARAM_DEF/b_jrm09_can.xml b/PARAM_DEF/b_jrm09_can.xml
index 69cd4ed..5c53256 100644
--- a/PARAM_DEF/b_jrm09_can.xml
+++ b/PARAM_DEF/b_jrm09_can.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<param xml:id="b_jrm09_can_##sampling##_##orbit##_##can##">
+<param xml:id="b_jrm09_can_##sampling##_##can##_##orbit##">
   <get>
 	<amdaParam name="##orbit##"/>
   </get>
diff --git a/PARAM_DEF/b_jrm09_can_tot.xml b/PARAM_DEF/b_jrm09_can_tot.xml
index ebd22e9..3ec3006 100644
--- a/PARAM_DEF/b_jrm09_can_tot.xml
+++ b/PARAM_DEF/b_jrm09_can_tot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<param xml:id="b_jrm09_can_tot_##sampling##_##orbit##_##can##">
+<param xml:id="b_jrm09_can_tot_##sampling##_##can##_##orbit##">
   <get>
 	<amdaParam name="##orbit##"/>
   </get>
diff --git a/ParamTemplateList.xml b/ParamTemplateList.xml
index 121b075..5be8d02 100644
--- a/ParamTemplateList.xml
+++ b/ParamTemplateList.xml
@@ -773,9 +773,10 @@
 			</argument>
 		</arguments>
 	</paramTemplate>
-    <paramTemplate paramId='b_jrm09_can' fileName='b_jrm09_can_##sampling##_##orbit##_##can##'>
+    <paramTemplate paramId='b_jrm09_can' fileName='b_jrm09_can_##sampling##_##can##_##orbit##'>
 		<arguments>
 			<argument key='sampling' name='Time Step (sec)' type='float' default='60'/>
+			<argument key='can' name='Use CAN81 model' type='bool' default='1'/>
 			<argument key='orbit' name='Spacecraft Orbit' type='list' default='juno_jup_xyz'>
 				<item key='juno_jup_xyz' name='JUNO'/>
 				<item key='juice_jucr30_xyz' name='JUICE_cr30'/>
@@ -783,12 +784,12 @@
                 <item key='juice_jucr41_xyz' name='JUICE_cr41'/>
                 <item key='gll_xyz_iau' name='Galileo'/>
 			</argument>
-            <argument key='can' name='Use CAN81 model' type='bool' default='1'/>
 		</arguments>
 	</paramTemplate>
-    <paramTemplate paramId='b_jrm09_can_tot' fileName='b_jrm09_can_tot_##sampling##_##orbit##_##can##'>
+    <paramTemplate paramId='b_jrm09_can_tot' fileName='b_jrm09_can_tot_##sampling##_##can#_##orbit##'>
 		<arguments>
 			<argument key='sampling' name='Time Step (sec)' type='float' default='60'/>
+			<argument key='can' name='Use CAN81 model' type='bool' default='1'/>
 			<argument key='orbit' name='Spacecraft Orbit' type='list' default='juno_jup_xyz'>
 				<item key='juno_jup_xyz' name='JUNO'/>
 				<item key='juice_jucr30_xyz' name='JUICE_cr30'/>
@@ -796,7 +797,6 @@
                 <item key='juice_jucr41_xyz' name='JUICE_cr41'/>
                 <item key='gll_xyz_iau' name='Galileo'/>
 			</argument>
-            <argument key='can' name='Use CAN81 model' type='bool' default='1'/>
 		</arguments>
 	</paramTemplate>
 	<paramTemplate paramId='eiscat_esr42m_ne' fileName='eiscat_esr42m_ne_##mode##_##corrected##_##yaxis##'>
--
libgit2 0.21.2