diff --git a/ChangeLog b/ChangeLog index e5644b501922b8da1a9249a4be954a88bbf73260..26f1b3ca1c77dd0ed744fa4cc9c8eeddbbf17e81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-09-17 Richard Larsson <richard.larsson@uni-hamburg.de> + + * ARTS-CAT-DATA-10 + + * Rename XFIT files to contain XFIT, so that the name agrees + with the species-tag of ARTS. + 2024-01-31 Richard Larsson <richard.larsson@uni-hamburg.de> * ARTS-CAT-DATA-9 diff --git a/xsec/C2F6.xml b/xsec/C2F6-XFIT.xml similarity index 86% rename from xsec/C2F6.xml rename to xsec/C2F6-XFIT.xml index cbbbbbb38de1b7be88dcfbf48aa2d14a77695ff1..31753e781a943d8bad16364a8e9ba18fd3e7ad71 100644 --- a/xsec/C2F6.xml +++ b/xsec/C2F6-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="9"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="9"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="9"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2987"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="2987" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="4648"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="4648" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="5160"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="5160" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="34515"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,8 +58,8 @@ </Array> <Matrix name="Data" nrows="34515" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="83"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -70,8 +70,8 @@ </Array> <Matrix name="Data" nrows="83" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="1658"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -82,8 +82,8 @@ </Array> <Matrix name="Data" nrows="1658" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="21572"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -94,8 +94,8 @@ </Array> <Matrix name="Data" nrows="21572" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="3152"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -106,8 +106,8 @@ </Array> <Matrix name="Data" nrows="3152" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="84965"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -118,7 +118,7 @@ </Array> <Matrix name="Data" nrows="84965" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/C2F6.xml.bin b/xsec/C2F6-XFIT.xml.bin similarity index 100% rename from xsec/C2F6.xml.bin rename to xsec/C2F6-XFIT.xml.bin diff --git a/xsec/C3F8.xml b/xsec/C3F8-XFIT.xml similarity index 86% rename from xsec/C3F8.xml rename to xsec/C3F8-XFIT.xml index 2e43fbb63726ab725f750282ed02cf9851fb05d5..dcb0920ba84376372db0fff151e17014bece27e9 100644 --- a/xsec/C3F8.xml +++ b/xsec/C3F8-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="97909"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="97909" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/C3F8.xml.bin b/xsec/C3F8-XFIT.xml.bin similarity index 100% rename from xsec/C3F8.xml.bin rename to xsec/C3F8-XFIT.xml.bin diff --git a/xsec/C4F10.xml b/xsec/C4F10-XFIT.xml similarity index 86% rename from xsec/C4F10.xml rename to xsec/C4F10-XFIT.xml index 40007a122e72c2983903f7fb5860fc2194f39c28..9c4a0174f20d62138579839eaf2f7de93bfad216 100644 --- a/xsec/C4F10.xml +++ b/xsec/C4F10-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="99569"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="99569" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/C4F10.xml.bin b/xsec/C4F10-XFIT.xml.bin similarity index 100% rename from xsec/C4F10.xml.bin rename to xsec/C4F10-XFIT.xml.bin diff --git a/xsec/C5F12.xml b/xsec/C5F12-XFIT.xml similarity index 86% rename from xsec/C5F12.xml rename to xsec/C5F12-XFIT.xml index 3968289fd60164c1ea1c235588d24f3a85236e21..a35a4d9a32e742a5eccff723aa77d5f1c7d19809 100644 --- a/xsec/C5F12.xml +++ b/xsec/C5F12-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="3319"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="3319" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="58078"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="58078" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="84633"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="84633" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/C5F12.xml.bin b/xsec/C5F12-XFIT.xml.bin similarity index 100% rename from xsec/C5F12.xml.bin rename to xsec/C5F12-XFIT.xml.bin diff --git a/xsec/C6F14.xml b/xsec/C6F14-XFIT.xml similarity index 86% rename from xsec/C6F14.xml rename to xsec/C6F14-XFIT.xml index b0fde3bffc944ff3b88395c8a0303eb58cc0dbee..c9aed7ecb23058138b1e2ad650aa004981e6df12 100644 --- a/xsec/C6F14.xml +++ b/xsec/C6F14-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="58079"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="58079" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/C6F14.xml.bin b/xsec/C6F14-XFIT.xml.bin similarity index 100% rename from xsec/C6F14.xml.bin rename to xsec/C6F14-XFIT.xml.bin diff --git a/xsec/C8F18.xml b/xsec/C8F18-XFIT.xml similarity index 86% rename from xsec/C8F18.xml rename to xsec/C8F18-XFIT.xml index 2abf2a78f48b6456a0e8d62409e0cf5619ea005b..bbee7ef92c0bd9eded6207945adffbf3af9493ef 100644 --- a/xsec/C8F18.xml +++ b/xsec/C8F18-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="58079"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="58079" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/C8F18.xml.bin b/xsec/C8F18-XFIT.xml.bin similarity index 100% rename from xsec/C8F18.xml.bin rename to xsec/C8F18-XFIT.xml.bin diff --git a/xsec/CCl4.xml b/xsec/CCl4-XFIT.xml similarity index 86% rename from xsec/CCl4.xml rename to xsec/CCl4-XFIT.xml index 9601b4a4777fb32130548d849e8061081d4b62bc..8090cb4d96eef2dc6d0cb097a308a89d3e23851a 100644 --- a/xsec/CCl4.xml +++ b/xsec/CCl4-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="127457"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="127457" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CCl4.xml.bin b/xsec/CCl4-XFIT.xml.bin similarity index 100% rename from xsec/CCl4.xml.bin rename to xsec/CCl4-XFIT.xml.bin diff --git a/xsec/CF4.xml b/xsec/CF4-XFIT.xml similarity index 86% rename from xsec/CF4.xml rename to xsec/CF4-XFIT.xml index 0de0adc0902808560d35c8d2a094ba9c971d7072..429bf8647495c3eea3fbec9d7f157d3a37c9fd64 100644 --- a/xsec/CF4.xml +++ b/xsec/CF4-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="11285"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="11285" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="15265"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="15265" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="86459"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="86459" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CF4.xml.bin b/xsec/CF4-XFIT.xml.bin similarity index 100% rename from xsec/CF4.xml.bin rename to xsec/CF4-XFIT.xml.bin diff --git a/xsec/CFC11.xml b/xsec/CFC11-XFIT.xml similarity index 86% rename from xsec/CFC11.xml rename to xsec/CFC11-XFIT.xml index e2ee47f1058a237208233463cd953d5488122d60..c4f3ae2b5864a9b89b9785570ebb8980b9b9b646 100644 --- a/xsec/CFC11.xml +++ b/xsec/CFC11-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="5"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="5"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="5"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="3983"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="3983" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="23231"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="23231" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2820"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="2820" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="23231"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,8 +58,8 @@ </Array> <Matrix name="Data" nrows="23231" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="89280"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -70,7 +70,7 @@ </Array> <Matrix name="Data" nrows="89280" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CFC11.xml.bin b/xsec/CFC11-XFIT.xml.bin similarity index 100% rename from xsec/CFC11.xml.bin rename to xsec/CFC11-XFIT.xml.bin diff --git a/xsec/CFC113.xml b/xsec/CFC113-XFIT.xml similarity index 86% rename from xsec/CFC113.xml rename to xsec/CFC113-XFIT.xml index cb890833b5c20d58cac9331e736bbbcc4de4f267..e2bd612a4e04ce6a97b9823b10cad1362a7d8f27 100644 --- a/xsec/CFC113.xml +++ b/xsec/CFC113-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="2"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="2"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="2"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="43149"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="43149" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="62232"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,7 +34,7 @@ </Array> <Matrix name="Data" nrows="62232" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CFC113.xml.bin b/xsec/CFC113-XFIT.xml.bin similarity index 100% rename from xsec/CFC113.xml.bin rename to xsec/CFC113-XFIT.xml.bin diff --git a/xsec/CFC114.xml b/xsec/CFC114-XFIT.xml similarity index 86% rename from xsec/CFC114.xml rename to xsec/CFC114-XFIT.xml index c236334337ce8f2db530b87d4ce159073110b616..b989f028589b483543015b3e92d8c4ab2e06d586 100644 --- a/xsec/CFC114.xml +++ b/xsec/CFC114-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="9"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="9"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="9"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="3568"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="3568" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="3038"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="3038" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="165"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="165" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="6068"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,8 +58,8 @@ </Array> <Matrix name="Data" nrows="6068" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="1161"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -70,8 +70,8 @@ </Array> <Matrix name="Data" nrows="1161" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2498"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -82,8 +82,8 @@ </Array> <Matrix name="Data" nrows="2498" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="464"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -94,8 +94,8 @@ </Array> <Matrix name="Data" nrows="464" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="12808"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -106,8 +106,8 @@ </Array> <Matrix name="Data" nrows="12808" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="61651"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -118,7 +118,7 @@ </Array> <Matrix name="Data" nrows="61651" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CFC114.xml.bin b/xsec/CFC114-XFIT.xml.bin similarity index 100% rename from xsec/CFC114.xml.bin rename to xsec/CFC114-XFIT.xml.bin diff --git a/xsec/CFC115.xml b/xsec/CFC115-XFIT.xml similarity index 86% rename from xsec/CFC115.xml rename to xsec/CFC115-XFIT.xml index 5d23ca6962e91d26f909bb7e41e60f0eb703af11..9409b05fd2f571cbf3b19e5fb92827a73cc71466 100644 --- a/xsec/CFC115.xml +++ b/xsec/CFC115-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="4049"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="4049" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2359"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="2359" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="6269"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="6269" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CFC115.xml.bin b/xsec/CFC115-XFIT.xml.bin similarity index 100% rename from xsec/CFC115.xml.bin rename to xsec/CFC115-XFIT.xml.bin diff --git a/xsec/CFC12.xml b/xsec/CFC12-XFIT.xml similarity index 86% rename from xsec/CFC12.xml rename to xsec/CFC12-XFIT.xml index 3803eb530f4fb092ff31488c92cabc75734b2bf6..68032971ca795dfe352ed13353a4967d6a314d28 100644 --- a/xsec/CFC12.xml +++ b/xsec/CFC12-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="374368"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="374368" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CFC12.xml.bin b/xsec/CFC12-XFIT.xml.bin similarity index 100% rename from xsec/CFC12.xml.bin rename to xsec/CFC12-XFIT.xml.bin diff --git a/xsec/CH2Cl2.xml b/xsec/CH2Cl2-XFIT.xml similarity index 86% rename from xsec/CH2Cl2.xml rename to xsec/CH2Cl2-XFIT.xml index 9d51c9242e805c9c284845c17ad16350f81b43f9..0aa6b6c455513364ce1e766ff1b88d958ddcc144 100644 --- a/xsec/CH2Cl2.xml +++ b/xsec/CH2Cl2-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="97909"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="97909" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CH2Cl2.xml.bin b/xsec/CH2Cl2-XFIT.xml.bin similarity index 100% rename from xsec/CH2Cl2.xml.bin rename to xsec/CH2Cl2-XFIT.xml.bin diff --git a/xsec/CH3CCl3.xml b/xsec/CH3CCl3-XFIT.xml similarity index 86% rename from xsec/CH3CCl3.xml rename to xsec/CH3CCl3-XFIT.xml index f7a77f6717d6de06bee1fc5ebad1ef5861e8b23e..06eb639a8774e8cf6680f5588d7ef41702288753 100644 --- a/xsec/CH3CCl3.xml +++ b/xsec/CH3CCl3-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="99569"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="99569" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CH3CCl3.xml.bin b/xsec/CH3CCl3-XFIT.xml.bin similarity index 100% rename from xsec/CH3CCl3.xml.bin rename to xsec/CH3CCl3-XFIT.xml.bin diff --git a/xsec/CHCl3.xml b/xsec/CHCl3-XFIT.xml similarity index 86% rename from xsec/CHCl3.xml rename to xsec/CHCl3-XFIT.xml index 2b3ae38d1b574bd6b92a1dba24a8de23a8abb0b8..4c65be75226dbc41a841f0d63dd365f318442794 100644 --- a/xsec/CHCl3.xml +++ b/xsec/CHCl3-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2406"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="2406" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="1668"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="1668" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="106113"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="106113" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/CHCl3.xml.bin b/xsec/CHCl3-XFIT.xml.bin similarity index 100% rename from xsec/CHCl3.xml.bin rename to xsec/CHCl3-XFIT.xml.bin diff --git a/xsec/HCFC141b.xml b/xsec/HCFC141b-XFIT.xml similarity index 86% rename from xsec/HCFC141b.xml rename to xsec/HCFC141b-XFIT.xml index 5bce28be40d4aed3f066a362c8649769fe292cdb..9ecb45b2fa69be723f958e844896eeb530675378 100644 --- a/xsec/HCFC141b.xml +++ b/xsec/HCFC141b-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="166"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="166" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="337178"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="337178" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="56421"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="56421" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HCFC141b.xml.bin b/xsec/HCFC141b-XFIT.xml.bin similarity index 100% rename from xsec/HCFC141b.xml.bin rename to xsec/HCFC141b-XFIT.xml.bin diff --git a/xsec/HCFC142b.xml b/xsec/HCFC142b-XFIT.xml similarity index 86% rename from xsec/HCFC142b.xml rename to xsec/HCFC142b-XFIT.xml index 1278b706eed62a78319f9aac6738b6d207aa0b8e..70ab9e008ae6cb62b05fe27d17e9c6f64023165b 100644 --- a/xsec/HCFC142b.xml +++ b/xsec/HCFC142b-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="830"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="830" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="112834"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="112834" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="82973"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="82973" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HCFC142b.xml.bin b/xsec/HCFC142b-XFIT.xml.bin similarity index 100% rename from xsec/HCFC142b.xml.bin rename to xsec/HCFC142b-XFIT.xml.bin diff --git a/xsec/HCFC22.xml b/xsec/HCFC22-XFIT.xml similarity index 86% rename from xsec/HCFC22.xml rename to xsec/HCFC22-XFIT.xml index bdae06295a0b6361fd7b67832ab0d962c0cb0256..4b2265d78783f9fd4de14d92389c95d3e1775aaf 100644 --- a/xsec/HCFC22.xml +++ b/xsec/HCFC22-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="517722"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="517722" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HCFC22.xml.bin b/xsec/HCFC22-XFIT.xml.bin similarity index 100% rename from xsec/HCFC22.xml.bin rename to xsec/HCFC22-XFIT.xml.bin diff --git a/xsec/HFC125.xml b/xsec/HFC125-XFIT.xml similarity index 86% rename from xsec/HFC125.xml rename to xsec/HFC125-XFIT.xml index 40462001a71c7760b62c4fa8a5d2bde020abdee0..0d601ac8d49a1504d6de64c32c46936b49978e6e 100644 --- a/xsec/HFC125.xml +++ b/xsec/HFC125-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="4"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="4"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="4"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="7"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="7" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="81"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="81" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="20846"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="20846" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="82905"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,7 +58,7 @@ </Array> <Matrix name="Data" nrows="82905" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC125.xml.bin b/xsec/HFC125-XFIT.xml.bin similarity index 100% rename from xsec/HFC125.xml.bin rename to xsec/HFC125-XFIT.xml.bin diff --git a/xsec/HFC134a.xml b/xsec/HFC134a-XFIT.xml similarity index 86% rename from xsec/HFC134a.xml rename to xsec/HFC134a-XFIT.xml index a9a8d8988c84cbd6d7336153d24377183ec1a411..02e3876c97fe4efd3f53ad59a35f30fcbbb95bf7 100644 --- a/xsec/HFC134a.xml +++ b/xsec/HFC134a-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="29909"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="29909" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="9956"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="9956" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="677028"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="677028" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC134a.xml.bin b/xsec/HFC134a-XFIT.xml.bin similarity index 100% rename from xsec/HFC134a.xml.bin rename to xsec/HFC134a-XFIT.xml.bin diff --git a/xsec/HFC143a.xml b/xsec/HFC143a-XFIT.xml similarity index 86% rename from xsec/HFC143a.xml rename to xsec/HFC143a-XFIT.xml index 311273a93529a3ef2a91d69d6697f9c331e046ad..2717d6da9fb39ac0f294cd4c6ae71a1008595893 100644 --- a/xsec/HFC143a.xml +++ b/xsec/HFC143a-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="830"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="830" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="391608"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="391608" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="49784"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="49784" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC143a.xml.bin b/xsec/HFC143a-XFIT.xml.bin similarity index 100% rename from xsec/HFC143a.xml.bin rename to xsec/HFC143a-XFIT.xml.bin diff --git a/xsec/HFC152a.xml b/xsec/HFC152a-XFIT.xml similarity index 86% rename from xsec/HFC152a.xml rename to xsec/HFC152a-XFIT.xml index bdc6bf9549b560ad80f50e83c1018a8c40e77170..c083cd61517e20bfe52cc403d6f14a7261bbed89 100644 --- a/xsec/HFC152a.xml +++ b/xsec/HFC152a-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="9"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="9"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="9"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="5061"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="5061" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="992"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="992" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="18008"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="18008" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="5469"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,8 +58,8 @@ </Array> <Matrix name="Data" nrows="5469" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="18008"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -70,8 +70,8 @@ </Array> <Matrix name="Data" nrows="18008" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="11443"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -82,8 +82,8 @@ </Array> <Matrix name="Data" nrows="11443" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="19758"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -94,8 +94,8 @@ </Array> <Matrix name="Data" nrows="19758" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="989"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -106,8 +106,8 @@ </Array> <Matrix name="Data" nrows="989" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="82970"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -118,7 +118,7 @@ </Array> <Matrix name="Data" nrows="82970" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC152a.xml.bin b/xsec/HFC152a-XFIT.xml.bin similarity index 100% rename from xsec/HFC152a.xml.bin rename to xsec/HFC152a-XFIT.xml.bin diff --git a/xsec/HFC227ea.xml b/xsec/HFC227ea-XFIT.xml similarity index 86% rename from xsec/HFC227ea.xml rename to xsec/HFC227ea-XFIT.xml index f69ea6fe1ac17096a08afc238e2e6d12ffc31b18..3f2e975a60ca3c9e621c5b5fd1fd89a1da654627 100644 --- a/xsec/HFC227ea.xml +++ b/xsec/HFC227ea-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="2"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="2"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="2"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="829"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="829" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="99568"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,7 +34,7 @@ </Array> <Matrix name="Data" nrows="99568" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC227ea.xml.bin b/xsec/HFC227ea-XFIT.xml.bin similarity index 100% rename from xsec/HFC227ea.xml.bin rename to xsec/HFC227ea-XFIT.xml.bin diff --git a/xsec/HFC23.xml b/xsec/HFC23-XFIT.xml similarity index 86% rename from xsec/HFC23.xml rename to xsec/HFC23-XFIT.xml index e91e508894a2aaac40376ea0f25c6a5df49a8d01..3b7b74b60de51282bc55b593ec96f7bb27277a13 100644 --- a/xsec/HFC23.xml +++ b/xsec/HFC23-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="438070"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="438070" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC23.xml.bin b/xsec/HFC23-XFIT.xml.bin similarity index 100% rename from xsec/HFC23.xml.bin rename to xsec/HFC23-XFIT.xml.bin diff --git a/xsec/HFC236fa.xml b/xsec/HFC236fa-XFIT.xml similarity index 86% rename from xsec/HFC236fa.xml rename to xsec/HFC236fa-XFIT.xml index 253ec04fa34fa7980fcf6124493f29af0f1e64c7..ef1786e4e211ce8812239e78806f6eb29105cdc1 100644 --- a/xsec/HFC236fa.xml +++ b/xsec/HFC236fa-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="9549"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="9549" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC236fa.xml.bin b/xsec/HFC236fa-XFIT.xml.bin similarity index 100% rename from xsec/HFC236fa.xml.bin rename to xsec/HFC236fa-XFIT.xml.bin diff --git a/xsec/HFC245fa.xml b/xsec/HFC245fa-XFIT.xml similarity index 86% rename from xsec/HFC245fa.xml rename to xsec/HFC245fa-XFIT.xml index 897753df08e5fa65f6730a5ab6335632384c4a60..0d54067130dab03bd153ce207e56cbda738ae257 100644 --- a/xsec/HFC245fa.xml +++ b/xsec/HFC245fa-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="3569"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="3569" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC245fa.xml.bin b/xsec/HFC245fa-XFIT.xml.bin similarity index 100% rename from xsec/HFC245fa.xml.bin rename to xsec/HFC245fa-XFIT.xml.bin diff --git a/xsec/HFC32.xml b/xsec/HFC32-XFIT.xml similarity index 86% rename from xsec/HFC32.xml rename to xsec/HFC32-XFIT.xml index c3e575eac34cfbdf2658db77237d403aca15e878..70c47fdae3cd68ca6ec5cfa52bfeadb8a4cad448 100644 --- a/xsec/HFC32.xml +++ b/xsec/HFC32-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="7"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="7"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="7"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="415"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="415" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="10458"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="10458" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="6056"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="6056" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="15995"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,8 +58,8 @@ </Array> <Matrix name="Data" nrows="15995" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2473"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -70,8 +70,8 @@ </Array> <Matrix name="Data" nrows="2473" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="5973"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -82,8 +82,8 @@ </Array> <Matrix name="Data" nrows="5973" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="83385"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -94,7 +94,7 @@ </Array> <Matrix name="Data" nrows="83385" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC32.xml.bin b/xsec/HFC32-XFIT.xml.bin similarity index 100% rename from xsec/HFC32.xml.bin rename to xsec/HFC32-XFIT.xml.bin diff --git a/xsec/HFC365mfc.xml b/xsec/HFC365mfc-XFIT.xml similarity index 86% rename from xsec/HFC365mfc.xml rename to xsec/HFC365mfc-XFIT.xml index 5ad514341ec1614223f8b85cda10782ad33915a0..8af334a850e5e4f647da06efda529bd859bba946 100644 --- a/xsec/HFC365mfc.xml +++ b/xsec/HFC365mfc-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="23239"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="23239" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC365mfc.xml.bin b/xsec/HFC365mfc-XFIT.xml.bin similarity index 100% rename from xsec/HFC365mfc.xml.bin rename to xsec/HFC365mfc-XFIT.xml.bin diff --git a/xsec/HFC4310mee.xml b/xsec/HFC4310mee-XFIT.xml similarity index 86% rename from xsec/HFC4310mee.xml rename to xsec/HFC4310mee-XFIT.xml index 860a2963ec1635bd846c2c3194ff3e908b06565f..1942103f2eb05633c5598603a20612714b0b8d65 100644 --- a/xsec/HFC4310mee.xml +++ b/xsec/HFC4310mee-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="830"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="830" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="97908"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="97908" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="49784"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="49784" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/HFC4310mee.xml.bin b/xsec/HFC4310mee-XFIT.xml.bin similarity index 100% rename from xsec/HFC4310mee.xml.bin rename to xsec/HFC4310mee-XFIT.xml.bin diff --git a/xsec/Halon1211.xml b/xsec/Halon1211-XFIT.xml similarity index 86% rename from xsec/Halon1211.xml rename to xsec/Halon1211-XFIT.xml index 676d28634a5f71a8caa259fc82d752ab1f2ba35c..d5b0354f2e1ddd2b0fd8c93cc46f9206b722a089 100644 --- a/xsec/Halon1211.xml +++ b/xsec/Halon1211-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="97909"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="97909" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/Halon1211.xml.bin b/xsec/Halon1211-XFIT.xml.bin similarity index 100% rename from xsec/Halon1211.xml.bin rename to xsec/Halon1211-XFIT.xml.bin diff --git a/xsec/Halon1301.xml b/xsec/Halon1301-XFIT.xml similarity index 86% rename from xsec/Halon1301.xml rename to xsec/Halon1301-XFIT.xml index 8d5fd727cdab1c6a161f5dd84a142f9554c75deb..ae65863b42d91a0fc811ffb08c0af5603adc1e81 100644 --- a/xsec/Halon1301.xml +++ b/xsec/Halon1301-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="99399"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="99399" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/Halon1301.xml.bin b/xsec/Halon1301-XFIT.xml.bin similarity index 100% rename from xsec/Halon1301.xml.bin rename to xsec/Halon1301-XFIT.xml.bin diff --git a/xsec/Halon2402.xml b/xsec/Halon2402-XFIT.xml similarity index 86% rename from xsec/Halon2402.xml rename to xsec/Halon2402-XFIT.xml index 1529033329d19b061dc0769f25b6f558095eaed7..5f1ab140f1c45423b39d16a6cf1c0ae0eb93d5a1 100644 --- a/xsec/Halon2402.xml +++ b/xsec/Halon2402-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="98739"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="98739" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/Halon2402.xml.bin b/xsec/Halon2402-XFIT.xml.bin similarity index 100% rename from xsec/Halon2402.xml.bin rename to xsec/Halon2402-XFIT.xml.bin diff --git a/xsec/NF3.xml b/xsec/NF3-XFIT.xml similarity index 86% rename from xsec/NF3.xml rename to xsec/NF3-XFIT.xml index 49d3c6f4548936057158c3e00bbd80fc9f4f6128..51fe9fddb90cb0882070dabd63f90d59c219a3e9 100644 --- a/xsec/NF3.xml +++ b/xsec/NF3-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="97909"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="97909" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/NF3.xml.bin b/xsec/NF3-XFIT.xml.bin similarity index 100% rename from xsec/NF3.xml.bin rename to xsec/NF3-XFIT.xml.bin diff --git a/xsec/O3.xml b/xsec/O3-XFIT.xml similarity index 86% rename from xsec/O3.xml rename to xsec/O3-XFIT.xml index 381f7494857ae10e9b5e21169f47519bebe068d9..c0d0eed66356f12c3f67a0555c1eaa6a2d2a3595 100644 --- a/xsec/O3.xml +++ b/xsec/O3-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="457191"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="457191" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/O3.xml.bin b/xsec/O3-XFIT.xml.bin similarity index 100% rename from xsec/O3.xml.bin rename to xsec/O3-XFIT.xml.bin diff --git a/xsec/SF6.xml b/xsec/SF6-XFIT.xml similarity index 86% rename from xsec/SF6.xml rename to xsec/SF6-XFIT.xml index 1b0a39cdc19d9013bfc129da48e37c66e9168b25..dcb4c378589b24eb3abca68e0d9ec13abf900271 100644 --- a/xsec/SF6.xml +++ b/xsec/SF6-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="3"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="3"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="3"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="6057"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="6057" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="5476"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="5476" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="92013"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,7 +46,7 @@ </Array> <Matrix name="Data" nrows="92013" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/SF6.xml.bin b/xsec/SF6-XFIT.xml.bin similarity index 100% rename from xsec/SF6.xml.bin rename to xsec/SF6-XFIT.xml.bin diff --git a/xsec/SO2F2.xml b/xsec/SO2F2-XFIT.xml similarity index 86% rename from xsec/SO2F2.xml rename to xsec/SO2F2-XFIT.xml index d0d3210b830398496010269897d230a67a7dbfa0..2e9ddf01f2d6c5f54493413b2aa498a28ca5efed 100644 --- a/xsec/SO2F2.xml +++ b/xsec/SO2F2-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="1"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="1"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="1"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="99569"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,7 +22,7 @@ </Array> <Matrix name="Data" nrows="99569" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/SO2F2.xml.bin b/xsec/SO2F2-XFIT.xml.bin similarity index 100% rename from xsec/SO2F2.xml.bin rename to xsec/SO2F2-XFIT.xml.bin diff --git a/xsec/cC4F8.xml b/xsec/cC4F8-XFIT.xml similarity index 86% rename from xsec/cC4F8.xml rename to xsec/cC4F8-XFIT.xml index 88685ed6a3076f1ee7b79f5c20b69cee07cf333a..d49362fafe7424de0ee74c51e575599ca16f61a6 100644 --- a/xsec/cC4F8.xml +++ b/xsec/cC4F8-XFIT.xml @@ -10,8 +10,8 @@ </Vector> <Vector name="Maximum temperatures from fit" nelem="5"> </Vector> -<Array name="Fit coefficients" type="GriddedField2" nelem="5"> -<GriddedField2> +<Array name="Fit coefficients" type="GriddedField1Named" nelem="5"> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="83"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -22,8 +22,8 @@ </Array> <Matrix name="Data" nrows="83" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="2328"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -34,8 +34,8 @@ </Array> <Matrix name="Data" nrows="2328" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="5143"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -46,8 +46,8 @@ </Array> <Matrix name="Data" nrows="5143" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="37178"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -58,8 +58,8 @@ </Array> <Matrix name="Data" nrows="37178" ncols="4"> </Matrix> -</GriddedField2> -<GriddedField2> +</GriddedField1Named> +<GriddedField1Named> <Vector name="frequency grid [Hz]" nelem="83636"> </Vector> <Array name="fit coefficients [m]" type="String" nelem="4"> @@ -70,7 +70,7 @@ </Array> <Matrix name="Data" nrows="83636" ncols="4"> </Matrix> -</GriddedField2> +</GriddedField1Named> </Array> </XsecRecord> </arts> diff --git a/xsec/cC4F8.xml.bin b/xsec/cC4F8-XFIT.xml.bin similarity index 100% rename from xsec/cC4F8.xml.bin rename to xsec/cC4F8-XFIT.xml.bin