CDPP / AMDA_INTERNAL_METADATA

Commit aba32eb28432d74af616cd4d54c76485418c7bde

Authored by Benjamin Renard
1 parent 042c9f94
Exists in juice_jdc and in 1 other branch amdadev

Fix maglib parameters for Cluster

Showing 8 changed files with 66 additions and 43 deletions   Show diff stats
Inline Side-by-side
INTERNAL_PARAM_DEF/c1_iau_earth.xml 0 → 100644
  Diff comments   View file @aba32eb
... ... @@ -0,0 +1,2 @@
  1 +<?xml version="1.0"?>
  2 +<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>
... ...
INTERNAL_PARAM_DEF/c2_iau_earth.xml 0 → 100644
  Diff comments   View file @aba32eb
... ... @@ -0,0 +1,2 @@
  1 +<?xml version="1.0"?>
  2 +<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>
... ...
INTERNAL_PARAM_DEF/c3_iau_earth.xml 0 → 100644
  Diff comments   View file @aba32eb
... ... @@ -0,0 +1,2 @@
  1 +<?xml version="1.0"?>
  2 +<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>
... ...
INTERNAL_PARAM_DEF/c4_iau_earth.xml 0 → 100644
  Diff comments   View file @aba32eb
... ... @@ -0,0 +1,2 @@
  1 +<?xml version="1.0"?>
  2 +<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>
... ...
INTERNAL_PARAM_DEF/maglib_invlat.xml
  Diff comments   View file @aba32eb
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="maglib_invlat_##ORBIT##">
  2 +<param xml:id="maglib_invlat_##MAGOUT##_##ORBIT##">
3 3 <info>
4 4 <name>InvLat ##ORBIT##</name>
5   - <short_name>invariant latitude along ##ORBIT##</short_name>
  5 + <short_name>InvLat along @@ORBIT@@</short_name>
6 6 <components/>
7 7 <units>degrees</units>
8 8 <coordinates_system/>
9 9 <tensor_order>0</tensor_order>
10 10 <si_conversion/>
11   - <fill_value/>
  11 + <fill_value>999</fill_value>
12 12 <ucd/>
13 13 <dataset_id/>
14 14 </info>
15 15 <get>
16   - <amdaParam name="##ORBIT##"/>
  16 + <amdaParam name="##ORBIT##_iau_earth"/>
17 17 </get>
18   - <process description="Invariant latitude along orbit">#maglib_invlat(#framesTransformation($##ORBIT##;GSM;IAU_EARTH;1);1;2)</process>
  18 + <process description="InvLat along @@ORBIT@@">#maglib_invlat($##ORBIT##_iau_earth;1;##MAGOUT##)</process>
19 19 <output/>
20 20 </param>
... ...
INTERNAL_PARAM_DEF/maglib_lparam.xml
  Diff comments   View file @aba32eb
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="maglib_lparam_##ORBIT##">
  2 +<param xml:id="maglib_lparam_##MAGOUT##_##ORBIT##">
3 3 <info>
4 4 <name>Lparam ##ORBIT##</name>
5   - <short_name>Galperin L parameter along ##ORBIT##</short_name>
  5 + <short_name>Galperin Lparam along @@ORBIT@@</short_name>
6 6 <components/>
7 7 <units/>
8 8 <coordinates_system/>
9 9 <tensor_order>0</tensor_order>
10 10 <si_conversion/>
11   - <fill_value/>
  11 + <fill_value>999</fill_value>
12 12 <ucd/>
13 13 <dataset_id/>
14 14 </info>
15 15 <get>
16   - <amdaParam name="##ORBIT##"/>
  16 + <amdaParam name="##ORBIT##_iau_earth"/>
17 17 </get>
18   - <process description="L param along orbit">#maglib_lparam(#framesTransformation($##ORBIT##;GSM;IAU_EARTH;1);1;2)</process>
  18 + <process description="Lparam along @@ORBIT@@">#maglib_lparam($##ORBIT##_iau_earth;1;##MAGOUT##)</process>
19 19 <output/>
20 20 </param>
... ...
INTERNAL_PARAM_DEF/maglib_mlt.xml
  Diff comments   View file @aba32eb
1 1 <?xml version="1.0" encoding="UTF-8"?>
2   -<param xml:id="maglib_mlt_##ORBIT##">
  2 +<param xml:id="maglib_mlt_##MAGOUT##_##ORBIT##">
3 3 <info>
4 4 <name>mlt ##ORBIT##</name>
5   - <short_name>magentic local time along ##ORBIT##</short_name>
  5 + <short_name>MLT along @@ORBIT@@</short_name>
6 6 <components/>
7 7 <units>hours</units>
8 8 <coordinates_system/>
9 9 <tensor_order>0</tensor_order>
10 10 <si_conversion/>
11   - <fill_value/>
  11 + <fill_value>999</fill_value>
12 12 <ucd/>
13 13 <dataset_id/>
14 14 </info>
15 15 <get>
16   - <amdaParam name="##ORBIT##"/>
  16 + <amdaParam name="##ORBIT##_iau_earth"/>
17 17 </get>
18   - <process description="Magnetic local time along orbit">#maglib_mlt(#framesTransformation($##ORBIT##;GSM;IAU_EARTH;1);1;2)</process>
  18 + <process description="MLT along @@ORBIT@@">#maglib_mlt($##ORBIT##_iau_earth;1;##MAGOUT##)</process>
19 19 <output/>
20 20 </param>
... ...
ParamTemplateList.xml
  Diff comments   View file @aba32eb
... ... @@ -1670,52 +1670,67 @@
1670 1670 </argument>
1671 1671 </arguments>
1672 1672 </paramTemplate>
1673   - <paramTemplate paramId="maglib_mlt" fileName="maglib_mlt_##ORBIT##">
  1673 + <paramTemplate paramId="maglib_mlt" fileName="maglib_mlt_##MAGOUT##_##ORBIT##">
1674 1674 <arguments>
1675   - <argument key="ORBIT" name="Spacecraft" type="list" default="c1_xyz_gsm">
1676   - <item key="c1_xyz_gsm" name="Cluster1"/>
1677   - <item key="c2_xyz_gsm" name="Cluster2"/>
1678   - <item key="c3_xyz_gsm" name="Cluster3"/>
1679   - <item key="c4_xyz_gsm" name="Cluster3"/>
  1675 + <argument key="MAGOUT" name="External field" type="list" subtype="int" default="1">
  1676 + <item key="1" name="Tsyganenko 87"/>
  1677 + <item key="2" name="Tsyganenko 89"/>
  1678 + <item key="3" name="Kosik 97"/>
  1679 + </argument>
  1680 + <argument key="ORBIT" name="Spacecraft" type="list" default="c1">
  1681 + <item key="c1" name="Cluster1"/>
  1682 + <item key="c2" name="Cluster2"/>
  1683 + <item key="c3" name="Cluster3"/>
  1684 + <item key="c4" name="Cluster4"/>
1680 1685 </argument>
1681 1686 </arguments>
1682 1687 <predefined>
1683   - <param>maglib_mlt_c1_xyz_gsm</param>
1684   - <param>maglib_mlt_c2_xyz_gsm</param>
1685   - <param>maglib_mlt_c3_xyz_gsm</param>
1686   - <param>maglib_mlt_c4_xyz_gsm</param>
  1688 + <param>maglib_mlt_1_c1</param>
  1689 + <param>maglib_mlt_1_c2</param>
  1690 + <param>maglib_mlt_1_c3</param>
  1691 + <param>maglib_mlt_1_c4</param>
1687 1692 </predefined>
1688 1693 </paramTemplate>
1689   - <paramTemplate paramId="maglib_invlat" fileName="maglib_invlat_##ORBIT##">
  1694 + <paramTemplate paramId="maglib_invlat" fileName="maglib_invlat_##MAGOUT##_##ORBIT##">
1690 1695 <arguments>
  1696 + <argument key="MAGOUT" name="External field" type="list" subtype="int" default="1">
  1697 + <item key="1" name="Tsyganenko 87"/>
  1698 + <item key="2" name="Tsyganenko 89"/>
  1699 + <item key="3" name="Kosik 97"/>
  1700 + </argument>
1691 1701 <argument key="ORBIT" name="Spacecraft" type="list" default="c1_xyz_gsm">
1692   - <item key="c1_xyz_gsm" name="Cluster1"/>
1693   - <item key="c2_xyz_gsm" name="Cluster2"/>
1694   - <item key="c3_xyz_gsm" name="Cluster3"/>
1695   - <item key="c4_xyz_gsm" name="Cluster3"/>
  1702 + <item key="c1" name="Cluster1"/>
  1703 + <item key="c2" name="Cluster2"/>
  1704 + <item key="c3" name="Cluster3"/>
  1705 + <item key="c4" name="Cluster4"/>
1696 1706 </argument>
1697 1707 </arguments>
1698 1708 <predefined>
1699   - <param>maglib_invlat_c1_xyz_gsm</param>
1700   - <param>maglib_invlat_c2_xyz_gsm</param>
1701   - <param>maglib_invlat_c3_xyz_gsm</param>
1702   - <param>maglib_invlat_c4_xyz_gsm</param>
  1709 + <param>maglib_invlat_1_c1</param>
  1710 + <param>maglib_invlat_1_c2</param>
  1711 + <param>maglib_invlat_1_c3</param>
  1712 + <param>maglib_invlat_1_c4</param>
1703 1713 </predefined>
1704 1714 </paramTemplate>
1705   - <paramTemplate paramId="maglib_lparam" fileName="maglib_lparam_##ORBIT##">
  1715 + <paramTemplate paramId="maglib_lparam" fileName="maglib_lparam_##MAGOUT##_##ORBIT##">
1706 1716 <arguments>
  1717 + <argument key="MAGOUT" name="External field" type="list" subtype="int" default="1">
  1718 + <item key="1" name="Tsyganenko 87"/>
  1719 + <item key="2" name="Tsyganenko 89"/>
  1720 + <item key="3" name="Kosik 97"/>
  1721 + </argument>
1707 1722 <argument key="ORBIT" name="Spacecraft" type="list" default="c1_xyz_gsm">
1708   - <item key="c1_xyz_gsm" name="Cluster1"/>
1709   - <item key="c2_xyz_gsm" name="Cluster2"/>
1710   - <item key="c3_xyz_gsm" name="Cluster3"/>
1711   - <item key="c4_xyz_gsm" name="Cluster3"/>
  1723 + <item key="c1" name="Cluster1"/>
  1724 + <item key="c2" name="Cluster2"/>
  1725 + <item key="c3" name="Cluster3"/>
  1726 + <item key="c4" name="Cluster4"/>
1712 1727 </argument>
1713 1728 </arguments>
1714 1729 <predefined>
1715   - <param>maglib_lparam_c1_xyz_gsm</param>
1716   - <param>maglib_lparam_c2_xyz_gsm</param>
1717   - <param>maglib_lparam_c3_xyz_gsm</param>
1718   - <param>maglib_lparam_c4_xyz_gsm</param>
  1730 + <param>maglib_lparam_1_c1</param>
  1731 + <param>maglib_lparam_1_c2</param>
  1732 + <param>maglib_lparam_1_c3</param>
  1733 + <param>maglib_lparam_1_c4</param>
1719 1734 </predefined>
1720 1735 </paramTemplate>
1721 1736 <paramTemplate paramId="cass_caps_els" fileName="cass_caps_els_##ANODE##">
... ...