diff --git a/INTERNAL_PARAM_DEF/c1_iau_earth.xml b/INTERNAL_PARAM_DEF/c1_iau_earth.xml new file mode 100644 index 0000000..0ae3d6a --- /dev/null +++ b/INTERNAL_PARAM_DEF/c1_iau_earth.xml @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<param xml:id="c1_iau_earth"><get><amdaParam name="c1_xyz_gse"/></get><process>#framesTransformation($c1_xyz_gse*RADIUS_EARTH;GSE;IAU_EARTH;true)/RADIUS_EARTH</process><output></output></param> diff --git a/INTERNAL_PARAM_DEF/c2_iau_earth.xml b/INTERNAL_PARAM_DEF/c2_iau_earth.xml new file mode 100644 index 0000000..10f2892 --- /dev/null +++ b/INTERNAL_PARAM_DEF/c2_iau_earth.xml @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<param xml:id="c2_iau_earth"><get><amdaParam name="c2_xyz_gse"/></get><process>#framesTransformation($c2_xyz_gse;GSE;IAU_EARTH;true)</process><output></output></param> diff --git a/INTERNAL_PARAM_DEF/c3_iau_earth.xml b/INTERNAL_PARAM_DEF/c3_iau_earth.xml new file mode 100644 index 0000000..294c0ff --- /dev/null +++ b/INTERNAL_PARAM_DEF/c3_iau_earth.xml @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<param xml:id="c3_iau_earth"><get><amdaParam name="c3_xyz_gse"/></get><process>#framesTransformation($c3_xyz_gse;GSE;IAU_EARTH;true)</process><output></output></param> diff --git a/INTERNAL_PARAM_DEF/c4_iau_earth.xml b/INTERNAL_PARAM_DEF/c4_iau_earth.xml new file mode 100644 index 0000000..1d4143c --- /dev/null +++ b/INTERNAL_PARAM_DEF/c4_iau_earth.xml @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<param xml:id="c4_iau_earth"><get><amdaParam name="c4_xyz_gse"/></get><process>#framesTransformation($c4_xyz_gse;GSE;IAU_EARTH;true)</process><output></output></param> diff --git a/INTERNAL_PARAM_DEF/maglib_invlat.xml b/INTERNAL_PARAM_DEF/maglib_invlat.xml index 45970e7..696ee8f 100644 --- a/INTERNAL_PARAM_DEF/maglib_invlat.xml +++ b/INTERNAL_PARAM_DEF/maglib_invlat.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<param xml:id="maglib_invlat_##ORBIT##"> +<param xml:id="maglib_invlat_##MAGOUT##_##ORBIT##"> <info> <name>InvLat ##ORBIT##</name> - <short_name>invariant latitude along ##ORBIT##</short_name> + <short_name>InvLat along @@ORBIT@@</short_name> <components/> <units>degrees</units> <coordinates_system/> <tensor_order>0</tensor_order> <si_conversion/> - <fill_value/> + <fill_value>999</fill_value> <ucd/> <dataset_id/> </info> <get> - <amdaParam name="##ORBIT##"/> + <amdaParam name="##ORBIT##_iau_earth"/> </get> - <process description="Invariant latitude along orbit">#maglib_invlat(#framesTransformation($##ORBIT##;GSM;IAU_EARTH;1);1;2)</process> + <process description="InvLat along @@ORBIT@@">#maglib_invlat($##ORBIT##_iau_earth;1;##MAGOUT##)</process> <output/> </param> diff --git a/INTERNAL_PARAM_DEF/maglib_lparam.xml b/INTERNAL_PARAM_DEF/maglib_lparam.xml index 2969b34..0a36211 100644 --- a/INTERNAL_PARAM_DEF/maglib_lparam.xml +++ b/INTERNAL_PARAM_DEF/maglib_lparam.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<param xml:id="maglib_lparam_##ORBIT##"> +<param xml:id="maglib_lparam_##MAGOUT##_##ORBIT##"> <info> <name>Lparam ##ORBIT##</name> - <short_name>Galperin L parameter along ##ORBIT##</short_name> + <short_name>Galperin Lparam along @@ORBIT@@</short_name> <components/> <units/> <coordinates_system/> <tensor_order>0</tensor_order> <si_conversion/> - <fill_value/> + <fill_value>999</fill_value> <ucd/> <dataset_id/> </info> <get> - <amdaParam name="##ORBIT##"/> + <amdaParam name="##ORBIT##_iau_earth"/> </get> - <process description="L param along orbit">#maglib_lparam(#framesTransformation($##ORBIT##;GSM;IAU_EARTH;1);1;2)</process> + <process description="Lparam along @@ORBIT@@">#maglib_lparam($##ORBIT##_iau_earth;1;##MAGOUT##)</process> <output/> </param> diff --git a/INTERNAL_PARAM_DEF/maglib_mlt.xml b/INTERNAL_PARAM_DEF/maglib_mlt.xml index 92a543a..5ecb49d 100644 --- a/INTERNAL_PARAM_DEF/maglib_mlt.xml +++ b/INTERNAL_PARAM_DEF/maglib_mlt.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<param xml:id="maglib_mlt_##ORBIT##"> +<param xml:id="maglib_mlt_##MAGOUT##_##ORBIT##"> <info> <name>mlt ##ORBIT##</name> - <short_name>magentic local time along ##ORBIT##</short_name> + <short_name>MLT along @@ORBIT@@</short_name> <components/> <units>hours</units> <coordinates_system/> <tensor_order>0</tensor_order> <si_conversion/> - <fill_value/> + <fill_value>999</fill_value> <ucd/> <dataset_id/> </info> <get> - <amdaParam name="##ORBIT##"/> + <amdaParam name="##ORBIT##_iau_earth"/> </get> - <process description="Magnetic local time along orbit">#maglib_mlt(#framesTransformation($##ORBIT##;GSM;IAU_EARTH;1);1;2)</process> + <process description="MLT along @@ORBIT@@">#maglib_mlt($##ORBIT##_iau_earth;1;##MAGOUT##)</process> <output/> </param> diff --git a/ParamTemplateList.xml b/ParamTemplateList.xml index 5dfad82..2b2d351 100644 --- a/ParamTemplateList.xml +++ b/ParamTemplateList.xml @@ -1670,52 +1670,67 @@ </argument> </arguments> </paramTemplate> - <paramTemplate paramId="maglib_mlt" fileName="maglib_mlt_##ORBIT##"> + <paramTemplate paramId="maglib_mlt" fileName="maglib_mlt_##MAGOUT##_##ORBIT##"> <arguments> - <argument key="ORBIT" name="Spacecraft" type="list" default="c1_xyz_gsm"> - <item key="c1_xyz_gsm" name="Cluster1"/> - <item key="c2_xyz_gsm" name="Cluster2"/> - <item key="c3_xyz_gsm" name="Cluster3"/> - <item key="c4_xyz_gsm" name="Cluster3"/> + <argument key="MAGOUT" name="External field" type="list" subtype="int" default="1"> + <item key="1" name="Tsyganenko 87"/> + <item key="2" name="Tsyganenko 89"/> + <item key="3" name="Kosik 97"/> + </argument> + <argument key="ORBIT" name="Spacecraft" type="list" default="c1"> + <item key="c1" name="Cluster1"/> + <item key="c2" name="Cluster2"/> + <item key="c3" name="Cluster3"/> + <item key="c4" name="Cluster4"/> </argument> </arguments> <predefined> - <param>maglib_mlt_c1_xyz_gsm</param> - <param>maglib_mlt_c2_xyz_gsm</param> - <param>maglib_mlt_c3_xyz_gsm</param> - <param>maglib_mlt_c4_xyz_gsm</param> + <param>maglib_mlt_1_c1</param> + <param>maglib_mlt_1_c2</param> + <param>maglib_mlt_1_c3</param> + <param>maglib_mlt_1_c4</param> </predefined> </paramTemplate> - <paramTemplate paramId="maglib_invlat" fileName="maglib_invlat_##ORBIT##"> + <paramTemplate paramId="maglib_invlat" fileName="maglib_invlat_##MAGOUT##_##ORBIT##"> <arguments> + <argument key="MAGOUT" name="External field" type="list" subtype="int" default="1"> + <item key="1" name="Tsyganenko 87"/> + <item key="2" name="Tsyganenko 89"/> + <item key="3" name="Kosik 97"/> + </argument> <argument key="ORBIT" name="Spacecraft" type="list" default="c1_xyz_gsm"> - <item key="c1_xyz_gsm" name="Cluster1"/> - <item key="c2_xyz_gsm" name="Cluster2"/> - <item key="c3_xyz_gsm" name="Cluster3"/> - <item key="c4_xyz_gsm" name="Cluster3"/> + <item key="c1" name="Cluster1"/> + <item key="c2" name="Cluster2"/> + <item key="c3" name="Cluster3"/> + <item key="c4" name="Cluster4"/> </argument> </arguments> <predefined> - <param>maglib_invlat_c1_xyz_gsm</param> - <param>maglib_invlat_c2_xyz_gsm</param> - <param>maglib_invlat_c3_xyz_gsm</param> - <param>maglib_invlat_c4_xyz_gsm</param> + <param>maglib_invlat_1_c1</param> + <param>maglib_invlat_1_c2</param> + <param>maglib_invlat_1_c3</param> + <param>maglib_invlat_1_c4</param> </predefined> </paramTemplate> - <paramTemplate paramId="maglib_lparam" fileName="maglib_lparam_##ORBIT##"> + <paramTemplate paramId="maglib_lparam" fileName="maglib_lparam_##MAGOUT##_##ORBIT##"> <arguments> + <argument key="MAGOUT" name="External field" type="list" subtype="int" default="1"> + <item key="1" name="Tsyganenko 87"/> + <item key="2" name="Tsyganenko 89"/> + <item key="3" name="Kosik 97"/> + </argument> <argument key="ORBIT" name="Spacecraft" type="list" default="c1_xyz_gsm"> - <item key="c1_xyz_gsm" name="Cluster1"/> - <item key="c2_xyz_gsm" name="Cluster2"/> - <item key="c3_xyz_gsm" name="Cluster3"/> - <item key="c4_xyz_gsm" name="Cluster3"/> + <item key="c1" name="Cluster1"/> + <item key="c2" name="Cluster2"/> + <item key="c3" name="Cluster3"/> + <item key="c4" name="Cluster4"/> </argument> </arguments> <predefined> - <param>maglib_lparam_c1_xyz_gsm</param> - <param>maglib_lparam_c2_xyz_gsm</param> - <param>maglib_lparam_c3_xyz_gsm</param> - <param>maglib_lparam_c4_xyz_gsm</param> + <param>maglib_lparam_1_c1</param> + <param>maglib_lparam_1_c2</param> + <param>maglib_lparam_1_c3</param> + <param>maglib_lparam_1_c4</param> </predefined> </paramTemplate> <paramTemplate paramId="cass_caps_els" fileName="cass_caps_els_##ANODE##"> -- libgit2 0.21.2