further simplification of 8AMP_PHSI interfaces (#694)

* merge in develop/8AMPI_PHSI

* Squashed commit of the following:

commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:23:00 2021 -0500

    merge in develop/SIDD-3.0

* unit-test breaks on Linux

* trying to re-enable more unittests

* test_valid_six unittests now working

* Squashed commit of the following:

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* trying to get the "french" SICD unit-test working

* Squashed commit of the following:

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* Squashed commit of the following:

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* Squashed commit of the following:

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* option to disable XML validation for SICD too

* add overloads for other code

* Squashed commit of the following:

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* still can't get French XML working

* Squashed commit of the following:

commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:45:39 2021 -0500

    Squashed commit of the following:

    commit 33bd17059640d2a02f9766285f05dcdff5de50a8
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:44:54 2021 -0500

        nitro release 2.10.7

    commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:42:09 2021 -0500

        coda-oss release 2021-12-13

    commit 86c1856021a5a944c464f9d3cba397a918f68a81
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:26 2021 -0500

        xml.lite tweaks from coda-oss

    commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f61d63e26fbd379516f073876bf5558050
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 12:26:10 2021 -0500

    more use of new xml.lite infrastructure

commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:58:22 2021 -0500

    use new xml.lite APIs to simplify code

commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:57 2021 -0500

    Squashed commit of the following:

    commit 86c1856021a5a944c464f9d3cba397a918f68a81
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:26 2021 -0500

        xml.lite tweaks from coda-oss

    commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f61d63e26fbd379516f073876bf5558050
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 09:06:38 2021 -0500

    Squashed commit of the following:

    commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 08:44:54 2021 -0500

        still can't get French XML working

    commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:37:11 2021 -0500

        Squashed commit of the following:

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit f705be9129ea7c71d6bdc25899b53fd3f655b974
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:35:35 2021 -0500

        add overloads for other code

    commit d61323431bea6e33c4f91b60cb83f3401b76671d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:57:55 2021 -0500

        option to disable XML validation for SICD too

    commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:44 2021 -0500

        Squashed commit of the following:

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:16:01 2021 -0500

        Squashed commit of the following:

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:53 2021 -0500

        Squashed commit of the following:

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:47:21 2021 -0500

        trying to get the "french" SICD unit-test working

    commit d63e6eace772c8d02616f467d698da48a14568dd
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:42:55 2021 -0500

        Squashed commit of the following:

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 09:29:07 2021 -0500

        test_valid_six unittests now working

    commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 17:45:26 2021 -0500

        trying to re-enable more unittests

    commit c787e98a7f339740389e10f5c5cb3760617f3ed1
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 16:54:28 2021 -0500

        unit-test breaks on Linux

    commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit 67768ea901bbd983becc4790b478afe0f17828d5
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 10:02:19 2021 -0500

    Squashed commit of the following:

    commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 09:29:07 2021 -0500

        test_valid_six unittests now working

    commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 17:45:26 2021 -0500

        trying to re-enable more unittests

    commit c787e98a7f339740389e10f5c5cb3760617f3ed1
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 16:54:28 2021 -0500

        unit-test breaks on Linux

    commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:26:24 2021 -0500

    Squashed commit of the following:

    commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:23:00 2021 -0500

    merge in develop/SIDD-3.0

* Squashed commit of the following:

commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:00:02 2021 -0500

    xml.lite changes that need to get back to coda-oss

commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:45:39 2021 -0500

    Squashed commit of the following:

    commit 33bd17059640d2a02f9766285f05dcdff5de50a8
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:44:54 2021 -0500

        nitro release 2.10.7

    commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:42:09 2021 -0500

        coda-oss release 2021-12-13

    commit 86c1856021a5a944c464f9d3cba397a918f68a81
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:26 2021 -0500

        xml.lite tweaks from coda-oss

    commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f61d63e26fbd379516f073876bf5558050
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 12:26:10 2021 -0500

    more use of new xml.lite infrastructure

commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:58:22 2021 -0500

    use new xml.lite APIs to simplify code

commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:57 2021 -0500

    Squashed commit of the following:

    commit 86c1856021a5a944c464f9d3cba397a918f68a81
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:26 2021 -0500

        xml.lite tweaks from coda-oss

    commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:36:09 2021 -0500

        test_xmlParser might be be running in coda-oss

    commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:17 2021 -0500

        "private" is part of name mangling

    commit 351a45f61d63e26fbd379516f073876bf5558050
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:54:13 2021 -0500

        more xml.lite updates from coda-oss

    commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:15:34 2021 -0500

        trying to fine the right macro for SWIG

    commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:34 2021 -0500

        need updates to Python bindings too

    commit e208dd4d072fd9f18860e84f54d68efdebef49a9
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:41:12 2021 -0500

        xml.lite changes from coda-oss

    commit 169df75cb962580fa63f1be3fbf9189c1fd74915
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 14:32:37 2021 -0500

        latest from coda-oss

commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 09:06:38 2021 -0500

    Squashed commit of the following:

    commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 08:44:54 2021 -0500

        still can't get French XML working

    commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:37:11 2021 -0500

        Squashed commit of the following:

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit f705be9129ea7c71d6bdc25899b53fd3f655b974
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 17:35:35 2021 -0500

        add overloads for other code

    commit d61323431bea6e33c4f91b60cb83f3401b76671d
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:57:55 2021 -0500

        option to disable XML validation for SICD too

    commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 16:09:44 2021 -0500

        Squashed commit of the following:

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 15:16:01 2021 -0500

        Squashed commit of the following:

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:51:53 2021 -0500

        Squashed commit of the following:

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:47:21 2021 -0500

        trying to get the "french" SICD unit-test working

    commit d63e6eace772c8d02616f467d698da48a14568dd
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 14:42:55 2021 -0500

        Squashed commit of the following:

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 09:29:07 2021 -0500

        test_valid_six unittests now working

    commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 17:45:26 2021 -0500

        trying to re-enable more unittests

    commit c787e98a7f339740389e10f5c5cb3760617f3ed1
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 16:54:28 2021 -0500

        unit-test breaks on Linux

    commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit 67768ea901bbd983becc4790b478afe0f17828d5
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 10:02:19 2021 -0500

    Squashed commit of the following:

    commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 09:29:07 2021 -0500

        test_valid_six unittests now working

    commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 17:45:26 2021 -0500

        trying to re-enable more unittests

    commit c787e98a7f339740389e10f5c5cb3760617f3ed1
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 16:54:28 2021 -0500

        unit-test breaks on Linux

    commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:26:24 2021 -0500

    Squashed commit of the following:

    commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:25:31 2021 -0500

        Squashed commit of the following:

        commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:23:00 2021 -0500

            merge in develop/SIDD-3.0

    commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:08:04 2021 -0500

        merge in develop/8AMPI_PHSI

commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 15:23:00 2021 -0500

    merge in develop/SIDD-3.0

* Squashed commit of the following:

commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd
Author: Dan Smith <[email protected]>
Date:   Mon Jan 3 11:12:43 2022 -0500

    latest from coda-oss

commit 22df5a95a3cbc3128780c63114a90181b4af33f8
Merge: db052a2d7 f1f19bdb6
Author: Dan Smith <[email protected]>
Date:   Wed Dec 29 12:25:28 2021 -0500

    Merge branch 'master' into develop/update-externals

commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c
Author: Dan Smith <[email protected]>
Date:   Wed Dec 29 09:17:08 2021 -0500

    adjust for coda-oss changes

commit 74ce242cf352a333684379cc9bd0278c0cf57571
Author: Dan Smith <[email protected]>
Date:   Wed Dec 29 09:01:34 2021 -0500

    latest from coda-oss

commit dc960f74d430442cd3359b8218ad9d9a144bd070
Author: Dan Smith <[email protected]>
Date:   Tue Dec 28 10:37:48 2021 -0500

    latest from coda-oss

commit c6a4bd5b900d83b3407f8793cc756f46965700f4
Author: Dan Smith <[email protected]>
Date:   Fri Dec 17 09:14:23 2021 -0500

    sanity-check a URI

commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 09:38:14 2021 -0500

    create a "path" after splitting on ":"

commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 08:50:17 2021 -0500

    simple URI validation

commit 3610f8e6e0f11a643831280819efb0aff3bb373d
Author: Dan Smith <[email protected]>
Date:   Tue Dec 14 09:46:21 2021 -0500

    xml.lite tweaks from coda-oss

commit 813be14c563d9f4829d342ec008b86da5ef77b27
Merge: 873d4b9d6 9ed21bed3
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 17:25:22 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10
Merge: 1c1a7222c ef191da2f
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:59:08 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:01:14 2021 -0500

    Squashed commit of the following:

    commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 13:00:02 2021 -0500

        xml.lite changes that need to get back to coda-oss

    commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:45:39 2021 -0500

        Squashed commit of the following:

        commit 33bd17059640d2a02f9766285f05dcdff5de50a8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:44:54 2021 -0500

            nitro release 2.10.7

        commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:42:09 2021 -0500

            coda-oss release 2021-12-13

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 12:26:10 2021 -0500

        more use of new xml.lite infrastructure

    commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:58:22 2021 -0500

        use new xml.lite APIs to simplify code

    commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:57 2021 -0500

        Squashed commit of the following:

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 09:06:38 2021 -0500

        Squashed commit of the following:

        commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 08:44:54 2021 -0500

            still can't get French XML working

        commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:37:11 2021 -0500

            Squashed commit of the following:

            commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 17:36:09 2021 -0500

                test_xmlParser might be be running in coda-oss

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit f705be9129ea7c71d6bdc25899b53fd3f655b974
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:35:35 2021 -0500

            add overloads for other code

        commit d61323431bea6e33c4f91b60cb83f3401b76671d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:57:55 2021 -0500

            option to disable XML validation for SICD too

        commit bc2c97e9f79ce91f2dc0ce9b3d5e45a7e60a852b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:44 2021 -0500

            Squashed commit of the following:

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4cd813b2f115cd2446821bf01dcf7d8c27781322
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:16:01 2021 -0500

            Squashed commit of the following:

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 7b210f96d175c35dd4d93a8ede3b1127b6fe442c
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:53 2021 -0500

            Squashed commit of the following:

            commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:51:34 2021 -0500

                need updates to Python bindings too

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit 4a4d621a17bb568fa07453a6a06f08f34efb7b73
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:47:21 2021 -0500

            trying to get the "french" SICD unit-test working

        commit d63e6eace772c8d02616f467d698da48a14568dd
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:42:55 2021 -0500

            Squashed commit of the following:

            commit e208dd4d072fd9f18860e84f54d68efdebef49a9
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 14:41:12 2021 -0500

                xml.lite changes from coda-oss

            commit 169df75cb962580fa63f1be3fbf9189c1fd74915
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 14:32:37 2021 -0500

                latest from coda-oss

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit 67768ea901bbd983becc4790b478afe0f17828d5
    Author: Dan Smith <[email protected]>
    Date:   Thu Dec 9 10:02:19 2021 -0500

        Squashed commit of the following:

        commit d1a7e6f442aff2530a7fd8078b88a56ce050238f
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 09:29:07 2021 -0500

            test_valid_six unittests now working

        commit d6fb257c92ab8e97e2d2a2164484011c60d2c95d
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 17:45:26 2021 -0500

            trying to re-enable more unittests

        commit c787e98a7f339740389e10f5c5cb3760617f3ed1
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 16:54:28 2021 -0500

            unit-test breaks on Linux

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit b582c055ba1f0f2532d2f5ad4c97b3cd649e69bd
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:26:24 2021 -0500

        Squashed commit of the following:

        commit bd82787be8ae4f4cd463faa2bb6d2cb5c6d7dba6
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:25:31 2021 -0500

            Squashed commit of the following:

            commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
            Author: Dan Smith <[email protected]>
            Date:   Wed Dec 8 15:23:00 2021 -0500

                merge in develop/SIDD-3.0

        commit e621466a38f21d5b66847f5358b4def1fd4ea4ce
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 15:08:04 2021 -0500

            merge in develop/8AMPI_PHSI

    commit c56ac71fcb152d3a802a548b59d90ccc09dfaf83
    Author: Dan Smith <[email protected]>
    Date:   Wed Dec 8 15:23:00 2021 -0500

        merge in develop/SIDD-3.0

commit 33bd17059640d2a02f9766285f05dcdff5de50a8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:44:54 2021 -0500

    nitro release 2.10.7

commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 11:42:09 2021 -0500

    coda-oss release 2021-12-13

commit 86c1856021a5a944c464f9d3cba397a918f68a81
Author: Dan Smith <[email protected]>
Date:   Fri Dec 10 11:57:26 2021 -0500

    xml.lite tweaks from coda-oss

commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 17:36:09 2021 -0500

    test_xmlParser might be be running in coda-oss

commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 16:09:17 2021 -0500

    "private" is part of name mangling

commit 351a45f61d63e26fbd379516f073876bf5558050
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:54:13 2021 -0500

    more xml.lite updates from coda-oss

commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 15:15:34 2021 -0500

    trying to fine the right macro for SWIG

commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:51:34 2021 -0500

    need updates to Python bindings too

commit e208dd4d072fd9f18860e84f54d68efdebef49a9
Author: Dan Smith <[email protected]>
Date:   Thu Dec 9 14:41:12 2021 -0500

    xml.lite changes from coda-oss

commit 169df75cb962580fa63f1be3fbf9189c1fd74915
Author: Dan Smith <[email protected]>
Date:   Wed Dec 8 14:32:37 2021 -0500

    latest from coda-oss

* we know the angle is in radians

* explicitly dependency on 'units'

* trying to fix broken build

* "C++" -> "c++"

* Squashed commit of the following:

commit 0b4deaa12fade653e20ccb4460fc424bef89d4c6
Author: Dan Smith <[email protected]>
Date:   Tue Jan 18 10:23:38 2022 -0500

    turn off some code-analysis diagnostics

commit 8797cd0b51617057496d9f89ea2a7602cabb13be
Author: Dan Smith <[email protected]>
Date:   Tue Jan 18 10:23:22 2022 -0500

    account for str:: changes in coda-oss

commit 920d0b79f1b91a1196171deaa61a91626ad7c44d
Author: Dan Smith <[email protected]>
Date:   Tue Jan 18 09:54:08 2022 -0500

    latest from coda-oss

commit 8e308afcf7b35945bdb3cb6c27cc94e63aa18b3b
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 15:26:32 2022 -0500

    construct a std::span directly, no make_span() utility (generates CA diagnostic)

commit d81a4d1aaac1cdaec1d9dc6a3838343e201d2b81
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 14:06:58 2022 -0500

    latest from coda-oss

commit 06716b781a3e6f0cf440b0f1bc5251bec415287e
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 13:24:46 2022 -0500

    finish renaming of sys/Filesystem.* to sys/filesystem.*

commit b3d0b4b8f4ad15c64e9f000143e64da3df1b241e
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 13:24:07 2022 -0500

    rename sys/Filesystem

commit c30ae278f01cc681c83a3a32afa3f3db174cfa06
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 12:30:21 2022 -0500

    no more gsl::make_span

commit e61dca0022fc39fdb9f4b63353dc93476fdd98bb
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 11:19:07 2022 -0500

    sys/Bit.h -> std/bit

commit bb67d052044cd1274d21b9b870f85da4b2040cf1
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 10:49:02 2022 -0500

    sys::Filesystem -> coda_oss::filesystem

commit ef212eaf09f87ffec27e8c043217ffbd33b29d1f
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 10:02:46 2022 -0500

    tweaks to get coda-oss building w/o warnings

commit 6f6bfaacc537067b7d36a363297e716e14e2e075
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 09:57:35 2022 -0500

    latest from "nitro"

commit 90be0243a2d384bc6ee0d81967240ee1d802bdb4
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 09:54:33 2022 -0500

    update to account for coda-oss changes

commit 28632726cc356524c5a3db5117ead37731342824
Author: Dan Smith <[email protected]>
Date:   Mon Jan 17 09:40:48 2022 -0500

    latest drop from coda-oss

commit 92632ef45f7369c3b0ebfdab65f4cdfa3f79f9d1
Author: Dan Smith <[email protected]>
Date:   Tue Jan 11 09:59:47 2022 -0500

    Utf-8 -> Windows-1252

commit 9b719935e8189bc3fbe57e4af4d221c3c49548c5
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 17:20:25 2022 -0500

    UTF-8 to native string conversion

commit 38dbe6d88e800f360cc9ae388558b09e5b65d95a
Merge: 74df9ee57 a11980f60
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 17:19:11 2022 -0500

    Merge branch 'master' into develop/update-externals

commit 74df9ee570e4d62fb6c435b4b5e0cef84b57b9d9
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 13:48:13 2022 -0500

    noexcept(false)

commit b5181bc210c3c2b0abc918842f6bd83b2a2d3907
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 12:01:40 2022 -0500

    remove comments with a backslash at the end

commit 08f8f9c27f46e793d3bc3d9e65b38facc8293521
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 11:36:15 2022 -0500

    certain NITRO unittests don't work in externals/nitro

commit dfc3ded9d3c52df1d038833afbdda94cf93e44ee
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 10:55:01 2022 -0500

    descriptor updates from "nitro"

commit c989c7ec700533a7ce0c294c09a80d68ed0ad6a4
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 10:41:48 2022 -0500

    fix #ifdef

commit 571ab4869aeb70f35dcfa046a36aed875c822739
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 10:27:53 2022 -0500

    latest from "nitro"

commit 26ba1a99646ac6db8b38d09e183be4318597efdd
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 10:26:37 2022 -0500

    latest from coda-oss

commit 28ab3500dc4c0f46ad61fd6356fdc76db8b4380e
Merge: 2cd678b7e 28afa6552
Author: Dan Smith <[email protected]>
Date:   Mon Jan 10 10:25:33 2022 -0500

    Merge branch 'master' into develop/update-externals

commit 2cd678b7e2d9fdd46906a6637903fd1325481ffc
Author: Dan Smith <[email protected]>
Date:   Thu Jan 6 15:39:49 2022 -0500

    more tweaks to remove compiler warnings

commit 5d8907616e5bdbf011a9ded45a7cf20e525789d8
Author: Dan Smith <[email protected]>
Date:   Thu Jan 6 15:19:57 2022 -0500

    remove errors/warnings from coda-oss

commit a535245afdd72ba24ad89f270d3012e12fd30c14
Author: Dan Smith <[email protected]>
Date:   Wed Jan 5 14:07:27 2022 -0500

    latest from nitro

commit aff92f496d1f402929707a3cb949c5fb7f4e14ba
Author: Dan Smith <[email protected]>
Date:   Wed Jan 5 14:04:39 2022 -0500

    latest from coda-oss

commit 41ba677e3418cb35ec636745ecb2a78fb7e1ac4e
Merge: 21cc8ed1f e2e3defbb
Author: Dan Smith <[email protected]>
Date:   Wed Jan 5 14:03:26 2022 -0500

    Merge branch 'master' into develop/update-externals

commit 21cc8ed1f01d74ab9d814fae97aa4f70c1e9ce34
Author: Dan Smith <[email protected]>
Date:   Mon Jan 3 16:43:08 2022 -0500

    use strongly-type TRE fields

commit 79eb6c8df45ee9f9d296c3d2152971458b6d8def
Author: Dan Smith <[email protected]>
Date:   Mon Jan 3 16:41:54 2022 -0500

    str::strip from coda-oss

commit faf20c7fbb3e3c1888215014b29a08c0b57f1caf
Author: Dan Smith <[email protected]>
Date:   Mon Jan 3 12:15:31 2022 -0500

    explicitly =delete move

commit ec79f1c0aac15ee0b36ed865b341f5d65e8ae0dd
Author: Dan Smith <[email protected]>
Date:   Mon Jan 3 11:12:43 2022 -0500

    latest from coda-oss

commit 22df5a95a3cbc3128780c63114a90181b4af33f8
Merge: db052a2d7 f1f19bdb6
Author: Dan Smith <[email protected]>
Date:   Wed Dec 29 12:25:28 2021 -0500

    Merge branch 'master' into develop/update-externals

commit db052a2d7bc7db05a9ccadcc5e1554275334bd9c
Author: Dan Smith <[email protected]>
Date:   Wed Dec 29 09:17:08 2021 -0500

    adjust for coda-oss changes

commit 74ce242cf352a333684379cc9bd0278c0cf57571
Author: Dan Smith <[email protected]>
Date:   Wed Dec 29 09:01:34 2021 -0500

    latest from coda-oss

commit dc960f74d430442cd3359b8218ad9d9a144bd070
Author: Dan Smith <[email protected]>
Date:   Tue Dec 28 10:37:48 2021 -0500

    latest from coda-oss

commit c6a4bd5b900d83b3407f8793cc756f46965700f4
Author: Dan Smith <[email protected]>
Date:   Fri Dec 17 09:14:23 2021 -0500

    sanity-check a URI

commit 82b1f21388dbf0f1b3e402ffaf151421d11149b8
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 09:38:14 2021 -0500

    create a "path" after splitting on ":"

commit 01cf2b5cadc18b97ac3a51bde9786b519755b1b1
Author: Dan Smith <[email protected]>
Date:   Wed Dec 15 08:50:17 2021 -0500

    simple URI validation

commit 3610f8e6e0f11a643831280819efb0aff3bb373d
Author: Dan Smith <[email protected]>
Date:   Tue Dec 14 09:46:21 2021 -0500

    xml.lite tweaks from coda-oss

commit 813be14c563d9f4829d342ec008b86da5ef77b27
Merge: 873d4b9d6 9ed21bed3
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 17:25:22 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 873d4b9d6c55ae2736fc6208ece14aecf67adf10
Merge: 1c1a7222c ef191da2f
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:59:08 2021 -0500

    Merge branch 'master' into develop/update-externals

commit 1c1a7222c527f5ae89b9c960eb9c3fa9f2ccefa4
Author: Dan Smith <[email protected]>
Date:   Mon Dec 13 13:01:14 2021 -0500

    Squashed commit of the following:

    commit 474b7f2dc37eaa3144b97be8f785911ace32eb4d
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 13:00:02 2021 -0500

        xml.lite changes that need to get back to coda-oss

    commit c9c0ec36cff6ab97ca5c03c3db712794fb511e6e
    Author: Dan Smith <[email protected]>
    Date:   Mon Dec 13 11:45:39 2021 -0500

        Squashed commit of the following:

        commit 33bd17059640d2a02f9766285f05dcdff5de50a8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:44:54 2021 -0500

            nitro release 2.10.7

        commit ef19ad2033851682eb3a37bada3a57fcb2b93ef8
        Author: Dan Smith <[email protected]>
        Date:   Mon Dec 13 11:42:09 2021 -0500

            coda-oss release 2021-12-13

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 1a74d4046085b286d6b0ae02bc62df608fc70ffa
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 12:26:10 2021 -0500

        more use of new xml.lite infrastructure

    commit 5d641a46f254f78f1e8a03c11f35f2f73c54ed5a
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:58:22 2021 -0500

        use new xml.lite APIs to simplify code

    commit 01f811e622eb3b8fcb7f20d8cba8c2d384894b31
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 11:57:57 2021 -0500

        Squashed commit of the following:

        commit 86c1856021a5a944c464f9d3cba397a918f68a81
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 11:57:26 2021 -0500

            xml.lite tweaks from coda-oss

        commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:36:09 2021 -0500

            test_xmlParser might be be running in coda-oss

        commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 16:09:17 2021 -0500

            "private" is part of name mangling

        commit 351a45f61d63e26fbd379516f073876bf5558050
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:54:13 2021 -0500

            more xml.lite updates from coda-oss

        commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 15:15:34 2021 -0500

            trying to fine the right macro for SWIG

        commit 8d6e11d803e167835ab3adb09bc96e18f7ac5d41
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:51:34 2021 -0500

            need updates to Python bindings too

        commit e208dd4d072fd9f18860e84f54d68efdebef49a9
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 14:41:12 2021 -0500

            xml.lite changes from coda-oss

        commit 169df75cb962580fa63f1be3fbf9189c1fd74915
        Author: Dan Smith <[email protected]>
        Date:   Wed Dec 8 14:32:37 2021 -0500

            latest from coda-oss

    commit 25b83eb24e0ebf095522df47349e7c5fbf1df8e3
    Author: Dan Smith <[email protected]>
    Date:   Fri Dec 10 09:06:38 2021 -0500

        Squashed commit of the following:

        commit 3f59a6260e33423c21326dde8e5bed7dc93cd9f0
        Author: Dan Smith <[email protected]>
        Date:   Fri Dec 10 08:44:54 2021 -0500

            still can't get French XML working

        commit 1a826e5c300d0e2781a015d1916eba8556a36c2d
        Author: Dan Smith <[email protected]>
        Date:   Thu Dec 9 17:37:11 2021 -0500

            Squashed commit of the following:

            commit f21f79d3f494e1ca8a5236e95ff5503fdb04e43b
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 17:36:09 2021 -0500

                test_xmlParser might be be running in coda-oss

            commit 3526cd00c6c29b7e8578b204088cafe4ec773ee1
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 16:09:17 2021 -0500

                "private" is part of name mangling

            commit 351a45f61d63e26fbd379516f073876bf5558050
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:54:13 2021 -0500

                more xml.lite updates from coda-oss

            commit 1c72ba2639502de8e0036c5efc12ea5a2df7b983
            Author: Dan Smith <[email protected]>
            Date:   Thu Dec 9 15:15:34 2021 -0500

                trying to fine the right macro for SWIG

            commit 8d6e11d803e167835ab…

six/modules/c++/six.sicd/include/six/sicd/ImageData.h

@@ -41,8 +41,6 @@ namespace six
 {
 namespace sicd
 {
-using cx_float = six::zfloat;
-
 class GeoData;
 /*!
  *  \struct ImageData

six/modules/c++/six.sicd/include/six/sicd/Utilities.h

@@ -635,9 +635,9 @@ struct Utilities final
     // Convert the amp/phase to a complex value using the given AmplitudeTable, if any.
     // This call could be in a tight loop where the value of six::AmplitudeTable* is known outside of the loop;
     // the overloads allow clients to avoid an inner `if`-check.
-    static std::complex<long double> toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable* pAmplitudeTable);
-    static std::complex<long double> toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable&);
-    static std::complex<long double> toComplex(uint8_t amplitude, uint8_t phase);
+    static six::zfloat toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable* pAmplitudeTable);
+    static six::zfloat toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable&);
+    static six::zfloat toComplex(uint8_t amplitude, uint8_t phase);
 };
 
 

six/modules/c++/six.sicd/source/ComplexData.cpp

@@ -373,7 +373,7 @@ bool six::sicd::ComplexData::convertPixels_(std::span<const std::byte> from_, st
     }
 
     // Convert the pixels from a complex<float> to AMP8I_PHS8I.
-    const auto from = make_span<const six::sicd::cx_float>(from_);
+    const auto from = make_span<const zfloat>(from_);
     to = imageData->fromComplex(from);
     return true; // converted
 }

six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I.cpp

@@ -71,12 +71,19 @@ The resulting green point is then what's used to find the nearest magnitude via
     * @param v complex value
     * @return phase between [0, 2PI]
     */
-inline auto GetPhase(const std::complex<long double>& v)
+inline auto GetPhase(std::complex<double> v)
 {
     double phase = std::arg(v);
     if (phase < 0.0) phase += std::numbers::pi * 2.0; // Wrap from [0, 2PI]
     return phase;
 }
+uint8_t six::sicd::details::ComplexToAMP8IPHS8I::getPhase(six::zfloat v) const
+{
+    // Phase is determined via arithmetic because it's equally spaced.
+    // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around
+    // handles cases that are close to 2PI.
+    return gsl::narrow_cast<uint8_t>(std::round(GetPhase(v) / phase_delta));
+}
 
 template<typename TToComplexFunc>
 static std::vector<float> make_magnitudes_(TToComplexFunc toComplex)
@@ -172,11 +179,7 @@ static inline uint8_t nearest(const std::vector<float>& magnitudes, float value)
 six::AMP8I_PHS8I_t six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbor(const six::zfloat &v) const
 {
     six::AMP8I_PHS8I_t retval;
-
-    // Phase is determined via arithmetic because it's equally spaced.
-    // There's an intentional conversion to zero when we cast 256 -> uint8. That wrap around
-    // handles cases that are close to 2PI.
-    retval.phase = gsl::narrow_cast<uint8_t>(std::round(GetPhase(v) / phase_delta));
+    retval.phase = getPhase(v);
 
     // We have to do a 1D nearest neighbor search for magnitude.
     // But it's not the magnitude of the input complex value - it's the projection of
@@ -230,24 +233,20 @@ static inline void transform(std::span<const TInputs> inputs, std::span<TResults
 #endif // CODA_OSS_cpp17
 }
 
-std::vector<six::AMP8I_PHS8I_t> six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(std::span<const cx_float> inputs) const
+std::vector<six::AMP8I_PHS8I_t> six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(
+    std::span<const zfloat> inputs, const six::AmplitudeTable* pAmplitudeTable)
 {
-    const auto nearest_neighbor_ = [&](const auto& v)
+    // make a structure to quickly find the nearest neighbor
+    const auto& converter = make(pAmplitudeTable);
+    const auto nearest_neighbor = [&converter](const auto& v)
     {
-        return this->nearest_neighbor(v);
+        return converter.nearest_neighbor(v);
     };
 
     std::vector<six::AMP8I_PHS8I_t> retval(inputs.size());
-    transform(sys::make_const_span(inputs), sys::make_span(retval), nearest_neighbor_);
+    transform(sys::make_const_span(inputs), sys::make_span(retval), nearest_neighbor);
     return retval;
 }
-std::vector<six::AMP8I_PHS8I_t> six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(
-    std::span<const cx_float> inputs, const six::AmplitudeTable* pAmplitudeTable)
-{
-    // make a structure to quickly find the nearest neighbor
-    const auto& converter = make(pAmplitudeTable);
-    return converter.nearest_neighbors(inputs);
-}
 
 const six::sicd::details::ComplexToAMP8IPHS8I& six::sicd::details::ComplexToAMP8IPHS8I::make(const six::AmplitudeTable* pAmplitudeTable)
 {

six/modules/c++/six.sicd/source/Utilities.cpp

@@ -97,21 +97,21 @@ static auto toComplex_(double A, uint8_t phase)
     const auto angle = units::Radians<double>{ 2 * std::numbers::pi * P };
     double sin_angle, cos_angle;
     SinCos(angle, sin_angle, cos_angle);
-    std::complex<long double> S(A * cos_angle, A * sin_angle);
+    six::zfloat S(A * cos_angle, A * sin_angle);
     return S;
 }
-std::complex<long double> six::sicd::Utilities::toComplex(uint8_t amplitude, uint8_t phase)
+six::zfloat six::sicd::Utilities::toComplex(uint8_t amplitude, uint8_t phase)
 {   
     // A = input_amplitude(i.e. 0 to 255)
     const double A = amplitude;
     return toComplex_(A, phase);
 }
-std::complex<long double> six::sicd::Utilities::toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable& amplitudeTable)
+six::zfloat six::sicd::Utilities::toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable& amplitudeTable)
 {
     const double A = amplitudeTable.index(amplitude);
     return toComplex_(A, phase);
 }
-std::complex<long double> six::sicd::Utilities::toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable* pAmplitudeTable)
+six::zfloat six::sicd::Utilities::toComplex(uint8_t amplitude, uint8_t phase, const six::AmplitudeTable* pAmplitudeTable)
 {
     if (pAmplitudeTable != nullptr)
     {

six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp

@@ -175,7 +175,7 @@ TEST_CASE(test_8bit_ampphs)
     TEST_ASSERT(actuals == expecteds);
 
 
-    // we should now be able to convert the cx_floats back to amp/value
+    // we should now be able to convert the `zfloat`s back to amp/value
     std::vector<AMP8I_PHS8I_t> amp8i_phs8i(actuals.size());
     to_AMP8I_PHS8I(imageData, actuals, amp8i_phs8i);
     test_assert_eq(testName, actuals, amp8i_phs8i);

six/modules/c++/six/include/six/AmplitudeTable.h

@@ -214,6 +214,8 @@ class ComplexToAMP8IPHS8I final
 
     //! The difference in phase angle between two UINT phase values.
     float phase_delta;
+    uint8_t getPhase(six::zfloat) const;
+
     //! Unit vector rays that represent each direction that phase can point.
     std::array<six::zfloat, UINT8_MAX + 1> phase_directions;
 };