diff --git a/PARAM_DEF/b_kt17_model.xml b/PARAM_DEF/b_kt17_model.xml
index 1d16f3a..9c80d52 100644
--- a/PARAM_DEF/b_kt17_model.xml
+++ b/PARAM_DEF/b_kt17_model.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<param xml:id="b_kt17_model_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
+<param xml:id="b_kt17_model_##sampling##_##rsun##_##dist##_##orbit##">
<get>
<amdaParam name="##orbit##"/>
</get>
- <process description="KT17_bcart(##orbit##,##sampling##,##ref##,##rsun##,##dist##)">#KT17_cart((#sampling_classic($##orbit##;##sampling##;5));##ref##;##rsun##;##dist##)</process>
+ <process description="KT17_bcart(##orbit##,##sampling##,MSO,##rsun##,##dist##)">#KT17_cart((#sampling_classic($##orbit##;##sampling##;5));MSO;##rsun##;##dist##)</process>
<output/>
</param>
diff --git a/PARAM_DEF/b_kt17_model_tot.xml b/PARAM_DEF/b_kt17_model_tot.xml
index 7f5f2a5..d0806ff 100644
--- a/PARAM_DEF/b_kt17_model_tot.xml
+++ b/PARAM_DEF/b_kt17_model_tot.xml
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<param xml:id="b_kt17_model_tot_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
+<param xml:id="b_kt17_model_tot_##sampling##_##rsun##_##dist##_##orbit##">
<get>
<amdaParam name="##orbit##"/>
</get>
- <process description="KT17_bmag(##orbit##,##sampling##,##ref##,##rsun##,##dist##)">#KT17_mag((#sampling_classic($##orbit##;##sampling##;5));##ref##;##rsun##;##dist##)</process>
+ <process description="KT17_bmag(##orbit##,##sampling##,MSO,##rsun##,##dist##)">#KT17_mag((#sampling_classic($##orbit##;##sampling##;5));MSO;##rsun##;##dist##)</process>
<output/>
</param>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_actIdx.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_actIdx.xml
deleted file mode 100644
index b1cd6c1..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_actIdx.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="mes_model_kt17_actIdx"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_all.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_all.xml
deleted file mode 100644
index 78fc34b..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_all.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="b_kt17_all">
- <dimensions dim_1="3" dim_2="1"/>
- <components>
- <component index_1="0" name="b_kt17_all[0]"/>
- <component index_1="1" name="b_kt17_all[1]"/>
- <component index_1="2" name="b_kt17_all[2]"/>
- </components>
- <tables/>
-</paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_all_tot.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_all_tot.xml
deleted file mode 100644
index ef94367..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_all_tot.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="b_kt17_all_tot"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_external.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_external.xml
deleted file mode 100644
index cc55386..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_external.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="mes_model_kt17_bme_xyz"><dimensions dim_1="3" dim_2="1"/><components><component index_1="0" name="b_kt17_external[0]"/><component index_1="1" name="b_kt17_external[1]"/><component index_1="2" name="b_kt17_external[2]"/></components><tables/></paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_external_tot.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_external_tot.xml
deleted file mode 100644
index e9367fa..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_external_tot.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="b_kt17_external_tot"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_internal.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_internal.xml
deleted file mode 100644
index d127863..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_internal.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="mes_model_kt17_bmi_xyz"><dimensions dim_1="3" dim_2="1"/><components><component index_1="0" name="b_kt17_internal[0]"/><component index_1="1" name="b_kt17_internal[1]"/><component index_1="2" name="b_kt17_internal[2]"/></components><tables/></paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_internal_tot.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_internal_tot.xml
deleted file mode 100644
index 62e5cef..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_internal_tot.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="b_kt17_internal_tot"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
diff --git a/PARAM_INFO_PREDEFINED/info_b_kt17_rhel.xml b/PARAM_INFO_PREDEFINED/info_b_kt17_rhel.xml
deleted file mode 100644
index 3d6eca6..0000000
--- a/PARAM_INFO_PREDEFINED/info_b_kt17_rhel.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<paraminfo id="mes_model_kt17_rhel_au"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
diff --git a/ParamTemplateList.xml b/ParamTemplateList.xml
index f114e41..af46c0a 100644
--- a/ParamTemplateList.xml
+++ b/ParamTemplateList.xml
@@ -1272,42 +1272,34 @@
<param>b_jrm33_con_tot_60_1_gll_xyz_iau</param>
</predefined>
</paramTemplate>
- <paramTemplate paramId="b_kt17_model" fileName="b_kt17_model_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
+ <paramTemplate paramId="b_kt17_model" fileName="b_kt17_model_##sampling##_##rsun##_##dist##_##orbit##">
<arguments>
<argument key="sampling" name="Time Step (sec)" type="float" default="60"/>
- <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
- <item key="mes_xyz_orbmso" name="MESSENGER"/>
- <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
+ <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
+ <argument key="dist" name="Disturbance Index" type="int" default="50"/>
+ <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
+ <item key="mes_xyz_orbmso" name="MESSENGER"/>
+ <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
</argument>
- <argument key="ref" name="Reference" type="list" default="MSO">
- <item key="MSO" name="MSO"/>
- <item key="MSM" name="MSM"/>
- </argument>
- <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
- <argument key="dist" name="Disturbance Index" type="int" default="50" min="0" max="97"/>
</arguments>
<predefined>
- <param>b_kt17_model_mes_xyz_orbmso_60_MSO_0.427_50</param>
- <param>b_kt17_model_m10_m1_xyz_mso_60_MSO_0.427_50</param>
+ <param>b_kt17_model_60_0.427_50_mes_xyz_orbmso</param>
+ <param>b_kt17_model_60_0.427_50_m10_m1_xyz_mso</param>
</predefined>
</paramTemplate>
- <paramTemplate paramId="b_kt17_model_tot" fileName="b_kt17_model_tot_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
+ <paramTemplate paramId="b_kt17_model_tot" fileName="b_kt17_model_tot_##sampling##_##rsun##_##dist##_##orbit##">
<arguments>
<argument key="sampling" name="Time Step (sec)" type="float" default="60"/>
- <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
- <item key="mes_xyz_orbmso" name="MESSENGER"/>
- <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
- </argument>
- <argument key="ref" name="Reference" type="list" default="MSO">
- <item key="MSO" name="MSO"/>
- <item key="MSM" name="MSM"/>
- </argument>
- <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
- <argument key="dist" name="Disturbance Index" type="int" default="50" min="0" max="97"/>
+ <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
+ <argument key="dist" name="Disturbance Index" type="int" default="50"/>
+ <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
+ <item key="mes_xyz_orbmso" name="MESSENGER"/>
+ <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
+ </argument>
</arguments>
<predefined>
- <param>b_kt17_model_tot_mes_xyz_orbmso_60_MSO_0.427_50</param>
- <param>b_kt17_model_tot_m10_m1_xyz_mso_60_MSO_0.427_50</param>
+ <param>b_kt17_model_tot_60_0.427_50_mes_xyz_orbmso</param>
+ <param>b_kt17_model_tot_60_0.427_50_m10_m1_xyz_mso</param>
</predefined>
</paramTemplate>
<paramTemplate paramId="bcain_mso" fileName="bcain_mso_##sampling##_##orbit##">
--
libgit2 0.21.2