Skip to content

Commit

Permalink
simplify 8AMPI_PHSI interfaces (#693)
Browse files Browse the repository at this point in the history 
* 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 8d6e11d803e167835ab3adb09bc96e18f7a…
  • Loading branch information
@andrew-hardin
J. Daniel Smith and andrew-hardin committed Sep 5, 2023
1 parent 7cf8d23 commit b262f4a
Show file tree
Hide file tree
Showing 14 changed files with 72 additions and 89 deletions.
2 changes: 1 addition & 1 deletion six/modules/c++/six.sicd/include/six/sicd/ComplexData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ struct ComplexData: public Data
{
imageData->pixelType = pixelType;
}
bool convertPixels_(std::span<const std::byte>, std::span<std::byte>) const override;
bool convertPixels_(std::span<const std::byte>, std::vector<AMP8I_PHS8I_t>&) const override;

/*!
* Maps to: /SICD/ImageData/NumRows,
Expand Down
7 changes: 3 additions & 4 deletions six/modules/c++/six.sicd/include/six/sicd/ImageData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@ struct ImageData

bool validate(const GeoData& geoData, logging::Logger& log) const;

static void testing_fromComplex_(std::span<const six::zfloat>, std::span<AMP8I_PHS8I_t>); // for unit-tests

static void toComplex(const six::Amp8iPhs8iLookup_t& lookup, std::span<const AMP8I_PHS8I_t>, std::span<six::zfloat>);
void toComplex(std::span<const AMP8I_PHS8I_t>, std::span<six::zfloat>) const;
void fromComplex(std::span<const six::zfloat>, std::span<AMP8I_PHS8I_t>) const;
std::vector<six::zfloat> toComplex(std::span<const AMP8I_PHS8I_t>) const;
std::vector<AMP8I_PHS8I_t> fromComplex(std::span<const six::zfloat>) const;
static std::vector<AMP8I_PHS8I_t> testing_fromComplex_(std::span<const six::zfloat>); // for unit-tests

/*!
* Create a lookup table for converting from AMP8I_PHS8I to complex.
Expand Down
9 changes: 2 additions & 7 deletions six/modules/c++/six.sicd/source/ComplexData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,18 +358,14 @@ inline const void* cast_to_pvoid(std::span<const std::byte> bytes)
{
return bytes.data();
}
inline void* cast_to_pvoid(std::span<std::byte> bytes)
{
return bytes.data();
}
template<typename T, typename U>
inline std::span<T> make_span(std::span<U> bytes)
{
const auto size = bytes.size() / sizeof(T);
return std::span<T>(static_cast<T*>(cast_to_pvoid(bytes)), size);
}

bool six::sicd::ComplexData::convertPixels_(std::span<const std::byte> from_, std::span<std::byte> to_) const
bool six::sicd::ComplexData::convertPixels_(std::span<const std::byte> from_, std::vector<AMP8I_PHS8I_t>& to) const
{
if (getPixelType() != PixelType::AMP8I_PHS8I)
{
Expand All @@ -378,7 +374,6 @@ 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 to = make_span<six::AMP8I_PHS8I_t>(to_);
imageData->fromComplex(from, to);
to = imageData->fromComplex(from);
return true; // converted
}
23 changes: 15 additions & 8 deletions six/modules/c++/six.sicd/source/ComplexToAMP8IPHS8I.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ template <typename TInputs, typename TResults, typename TFunc>
static inline void transform(std::span<const TInputs> inputs, std::span<TResults> results, TFunc f)
{
#if SIX_six_sicd_ComplexToAMP8IPHS8I_has_execution
std::ignore = std::transform(std::execution::par, inputs.begin(), inputs.end(), results.begin(), f);
std::ignore = std::transform(std::execution::par_unseq, inputs.begin(), inputs.end(), results.begin(), f);
#else
constexpr ptrdiff_t cutoff_ = 0; // too slow w/o multi-threading
// The value of "default_cutoff" was determined by testing; there is nothing special about it, feel free to change it.
Expand All @@ -230,16 +230,23 @@ static inline void transform(std::span<const TInputs> inputs, std::span<TResults
#endif // CODA_OSS_cpp17
}

void six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(std::span<const cx_float> inputs, std::span<AMP8I_PHS8I_t> results,
const six::AmplitudeTable* pAmplitudeTable)
std::vector<six::AMP8I_PHS8I_t> six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(std::span<const cx_float> inputs) const
{
// make a structure to quickly find the nearest neighbor
auto& converter = make(pAmplitudeTable);
const auto fromComplex_ = [&converter](const auto& v)
const auto nearest_neighbor_ = [&](const auto& v)
{
return converter.nearest_neighbor(v);
return this->nearest_neighbor(v);
};
transform(inputs, results, fromComplex_);

std::vector<six::AMP8I_PHS8I_t> retval(inputs.size());
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)
Expand Down
17 changes: 11 additions & 6 deletions six/modules/c++/six.sicd/source/ImageData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#define SIX_six_sicd_ImageData_has_execution 1
#endif
#endif
#include <sys/Span.h>

#include "six/AmplitudeTable.h"
#include "six/sicd/GeoData.h"
Expand Down Expand Up @@ -255,24 +256,28 @@ void ImageData::toComplex(const six::Amp8iPhs8iLookup_t& values, std::span<const
};
transform(inputs, results, toComplex_);
}
void ImageData::toComplex(std::span<const AMP8I_PHS8I_t> inputs, std::span<six::zfloat> results) const
std::vector<six::zfloat> ImageData::toComplex(std::span<const AMP8I_PHS8I_t> inputs) const
{
if (pixelType != PixelType::AMP8I_PHS8I)
{
throw std::runtime_error("pxielType must be AMP8I_PHS8I");
}

const auto& values = getLookup(amplitudeTable.get());
toComplex(values, inputs, results);

std::vector<six::zfloat> retval(inputs.size());
toComplex(values, inputs, sys::make_span(retval));
return retval;
}

void ImageData::fromComplex(std::span<const six::zfloat> inputs, std::span<AMP8I_PHS8I_t> results) const
std::vector<AMP8I_PHS8I_t> ImageData::fromComplex(std::span<const six::zfloat> inputs) const
{
six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(inputs, results, amplitudeTable.get());
return six::sicd::details::ComplexToAMP8IPHS8I::nearest_neighbors(inputs, amplitudeTable.get());
}
void ImageData::testing_fromComplex_(std::span<const six::zfloat> inputs, std::span<AMP8I_PHS8I_t> results)

std::vector<AMP8I_PHS8I_t> ImageData::testing_fromComplex_(std::span<const six::zfloat> inputs)
{
static const ImageData imageData;
assert(imageData.amplitudeTable.get() == nullptr);
imageData.fromComplex(inputs, results);
return imageData.fromComplex(inputs);
}
8 changes: 6 additions & 2 deletions six/modules/c++/six.sicd/source/Utilities.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <stdexcept>
#include <numeric>
#include <std/numbers>
#include <tuple>

#include <except/Exception.h>
#include <io/StringStream.h>
Expand Down Expand Up @@ -1679,8 +1680,11 @@ std::vector<std::byte> six::sicd::testing::toBytes(const ComplexImageResult& res
const auto& data = *(result.pComplexData);
if (data.getPixelType() == six::PixelType::AMP8I_PHS8I)
{
retval.resize(image.size() * data.getNumBytesPerPixel());
data.convertPixels(bytes, sys::make_span(retval));
std::vector<AMP8I_PHS8I_t> results;
std::ignore = data.convertPixels(bytes, results);

const auto result_bytes = std::as_bytes(sys::make_span(results));
retval.assign(result_bytes.begin(), result_bytes.end());
}
else
{
Expand Down
45 changes: 14 additions & 31 deletions six/modules/c++/six.sicd/unittests/test_AMP8I_PHS8I.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,16 @@ static void test_assert_eq(const std::string& testName,
}
}

static void from_AMP8I_PHS8I(const six::sicd::ImageData& imageData,
const std::vector<AMP8I_PHS8I_t>& inputs_, std::vector<six::zfloat>& results_)
inline static auto from_AMP8I_PHS8I(const six::sicd::ImageData& imageData,
const std::vector<AMP8I_PHS8I_t>& inputs)
{
const std::span<const AMP8I_PHS8I_t> inputs(inputs_.data(), inputs_.size());
const std::span<six::zfloat> results(results_.data(), results_.size());
imageData.toComplex(inputs, results);
return imageData.toComplex(sys::make_span(inputs));
}

static void to_AMP8I_PHS8I(const six::sicd::ImageData& imageData,
const std::vector<six::zfloat>& inputs_, std::vector<AMP8I_PHS8I_t>& results_)
inline static void to_AMP8I_PHS8I(const six::sicd::ImageData& imageData,
const std::vector<six::zfloat>& inputs, std::vector<AMP8I_PHS8I_t>& results)
{
const std::span<const six::zfloat> inputs(inputs_.data(), inputs_.size());
const std::span<AMP8I_PHS8I_t> results(results_.data(), results_.size());
imageData.fromComplex(inputs, results);
results = imageData.fromComplex(sys::make_span(inputs));
}

TEST_CASE(test_8bit_ampphs)
Expand All @@ -175,8 +171,7 @@ TEST_CASE(test_8bit_ampphs)
}
}

std::vector<six::zfloat> actuals(inputs.size());
from_AMP8I_PHS8I(imageData, inputs, actuals);
const auto actuals = from_AMP8I_PHS8I(imageData, inputs);
TEST_ASSERT(actuals == expecteds);


Expand Down Expand Up @@ -244,8 +239,7 @@ static Pair<uint64_t> to_AMP8I_PHS8I(const six::sicd::ImageData& imageData, cons
// image is far too big to call to_AMP8I_PHS8I() with DEBUG code
const auto size = sys::debug ? widebandData.size() / 200 : widebandData.size();
const std::span<const six::zfloat> widebandData_(widebandData.data(), size);
std::vector<AMP8I_PHS8I_t> results(widebandData_.size());
imageData.fromComplex(widebandData_, std::span< AMP8I_PHS8I_t>(results.data(), results.size()));
const auto results = imageData.fromComplex(widebandData_);

Pair<uint64_t> retval{ 0, 0 };
for (const auto& r : results)
Expand Down Expand Up @@ -396,12 +390,10 @@ static std::vector<six::zfloat> adjust_image(const six::sicd::ComplexData& compl
// Convert from AMP8I_PHS8I to that when we convert to AMP8I_PHS8I for writing
// we'll end up with the "[***...***]" in the file
void* image_data = image.data();
std::span<AMP8I_PHS8I_t> from_(static_cast<AMP8I_PHS8I_t*>(image_data), getExtent(complexData).area());
adjust_image(from_);
std::span<AMP8I_PHS8I_t> from(static_cast<AMP8I_PHS8I_t*>(image_data), getExtent(complexData).area());
adjust_image(from);

std::span<const AMP8I_PHS8I_t> from(from_.data(), from_.size());
std::vector<six::zfloat> retval(from.size());
complexData.imageData->toComplex(from, std::span<six::zfloat>(retval.data(), retval.size()));
const auto retval = complexData.imageData->toComplex(sys::make_const_span(from));
return retval;
}
static std::vector<six::zfloat> make_complex_image(const six::sicd::ComplexData& complexData, const types::RowCol<size_t>& dims)
Expand Down Expand Up @@ -505,10 +497,7 @@ static void test_assert_image_(const std::string& testName,
TEST_ASSERT_ALMOST_EQ(image[i].imag(), expected_cxfloat[i].imag());
}

const std::span<const six::zfloat> input(image.data(), image.size());
std::vector<AMP8I_PHS8I_t> result(input.size());
std::span< AMP8I_PHS8I_t> result_(result.data(), result.size());
complexData.imageData->fromComplex(input, result_);
const auto result = complexData.imageData->fromComplex(sys::make_span(image));

static const std::vector<AMP8I_PHS8I_t> expected_amp8i_phs8i{
AMP8I_PHS8I_t{91, 42}, AMP8I_PHS8I_t{42, 42}, AMP8I_PHS8I_t{42, 42}, AMP8I_PHS8I_t{42, 93} }; // "[******]"
Expand Down Expand Up @@ -561,10 +550,8 @@ static void test_adjusted_values(const std::string& testName, const std::vector<
{
v += delta;
}
std::vector<AMP8I_PHS8I_t> actual(expected.size());
std::span<AMP8I_PHS8I_t> actual_(actual.data(), actual.size());
std::span<const six::zfloat> values_(adjusted_values.data(), adjusted_values.size());
six::sicd::ImageData::testing_fromComplex_(values_, actual_);
const auto actual = six::sicd::ImageData::testing_fromComplex_(values_);
for (size_t i = 0; i < expected.size(); i++)
{
TEST_ASSERT_EQ(expected[i].amplitude, actual[i].amplitude);
Expand All @@ -584,11 +571,7 @@ TEST_CASE(test_nearest_neighbor)
{static_cast<uint8_t>(141), static_cast<uint8_t>(96)},
{static_cast<uint8_t>(255), static_cast<uint8_t>(160)} };

std::vector<AMP8I_PHS8I_t> actual(expected.size());
std::span<AMP8I_PHS8I_t> actual_(actual.data(), actual.size());
std::span<const six::zfloat> values_(values.data(), values.size());
six::sicd::ImageData::testing_fromComplex_(values_, actual_);

const auto actual = six::sicd::ImageData::testing_fromComplex_(sys::make_span(values));
for (size_t i = 0; i < expected.size(); i++)
{
TEST_ASSERT_EQ(expected[i].amplitude, actual[i].amplitude);
Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/six/include/six/Adapters.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class NewMemoryWriteHandler final : public nitf::WriteHandler // all of our code
std::span<const six::zint16_t> buffer,
size_t firstRow, const Data& data, bool doByteSwap);
NewMemoryWriteHandler(const NITFSegmentInfo& info,
std::span<const std::pair<uint8_t, uint8_t>> buffer,
std::span<const AMP8I_PHS8I_t> buffer,
size_t firstRow, const Data& data, bool doByteSwap);
};

Expand Down
4 changes: 3 additions & 1 deletion six/modules/c++/six/include/six/AmplitudeTable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,11 @@ class ComplexToAMP8IPHS8I final
* @return nearest amplitude and phase value
*/
AMP8I_PHS8I_t nearest_neighbor(const six::zfloat& v) const;
static void nearest_neighbors(std::span<const six::zfloat> inputs, std::span<AMP8I_PHS8I_t> results, const six::AmplitudeTable*);
static std::vector<AMP8I_PHS8I_t> nearest_neighbors(std::span<const six::zfloat> inputs, const six::AmplitudeTable*);

private:
std::vector<AMP8I_PHS8I_t> nearest_neighbors(std::span<const six::zfloat> inputs) const;

//! The sorted set of possible magnitudes order from small to large.
std::vector<float> uncached_magnitudes; // Order is important! This must be ...
const std::vector<float>& magnitudes; // ... before this.
Expand Down
25 changes: 6 additions & 19 deletions six/modules/c++/six/include/six/Data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,13 @@ struct Data
*/
virtual PixelType getPixelType() const = 0;
virtual void setPixelType(PixelType pixelType) = 0;
virtual bool convertPixels_(std::span<const std::byte>, std::span<std::byte>) const { return false; }
template<typename T, typename U>
bool convertPixels(std::span<const T> from, std::span<U> to) const
{
// coda-oss checks to be sure T and U are trivially_copyable. While this is
// correct (converting something else to bytes doesn't make sense), existing
// code didn't have that check.
//
// TODO: use std::as_bytes() directly

const void* const pFrom = from.data();
auto const pFromBytes = static_cast<const std::byte*>(pFrom);
const std::span<const std::byte> fromBytes(pFromBytes, from.size_bytes());

void* const pTo = to.data();
auto const pToBytes = static_cast<std::byte*>(pTo);
const std::span<std::byte> toBytes(pToBytes, to.size_bytes());

return convertPixels_(fromBytes, toBytes);
}
virtual bool convertPixels_(std::span<const std::byte>, std::vector<AMP8I_PHS8I_t>&) const { return false; }
template<typename T>
bool convertPixels(std::span<const T> from, std::vector<AMP8I_PHS8I_t>& to) const
{
return convertPixels_(std::as_bytes(from), to);
}

/*!
* Maps to: /SICD/ImageData/NumRows,/SICD/ImageData/FullImage/Row
Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/six/include/six/NITFWriteControl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ class NITFWriteControl : public WriteControl
// Be explicit about the types of images that can be saved; templates are provided below.
void save_image(std::span<const six::zfloat>, nitf::IOInterface&, const std::vector<std::filesystem::path>&);
void save_image(std::span<const six::zint16_t>, nitf::IOInterface&, const std::vector<std::filesystem::path>&);
void save_image(std::span<const std::pair<uint8_t, uint8_t>>, nitf::IOInterface&, const std::vector<std::filesystem::path>&);
void save_image(std::span<const AMP8I_PHS8I_t>, nitf::IOInterface&, const std::vector<std::filesystem::path>&);
void save_image(std::span<const uint8_t>, nitf::IOInterface&, const std::vector<std::filesystem::path>&);
void save_image(std::span<const uint16_t>, nitf::IOInterface&, const std::vector<std::filesystem::path>&);

Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/six/include/six/Types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ struct Constants
// Each pixel is stored as a pair of numbers that represent the amplitude and phase
// components. Each component is stored in an 8-bit unsigned integer (1 byte per
// component, 2 bytes per pixel).
static_assert(sizeof(std::pair<uint8_t, uint8_t>) == 2, "AMP8I_PHS8I should be two 8-bit integers");
static_assert(sizeof(AMP8I_PHS8I_t) == 2, "AMP8I_PHS8I should be two 8-bit integers");
return 2;
}

Expand Down
13 changes: 7 additions & 6 deletions six/modules/c++/six/source/Adapters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include <gsl/gsl.h>
#include <std/memory>

#include <sys/Span.h>

using namespace six;

template<typename TPImpl>
Expand Down Expand Up @@ -195,16 +197,15 @@ inline void validate_buffer(std::span<T> buffer, const NITFSegmentInfo& info, co
struct NewMemoryWriteHandler::Impl final
{
// This needs to persist beyhond the constructor
std::vector<std::pair<uint8_t, uint8_t>> ampi8i_phs8i;
std::vector<AMP8I_PHS8I_t> ampi8i_phs8i;

void convertPixels(NewMemoryWriteHandler& instance, const NITFSegmentInfo& info, std::span<const six::zfloat> buffer, const Data& data)
{
ampi8i_phs8i.resize(buffer.size());
const std::span<std::pair<uint8_t, uint8_t>> ampi8i_phs8i_(ampi8i_phs8i.data(), ampi8i_phs8i.size());
if (!data.convertPixels(buffer, ampi8i_phs8i_))
if (!data.convertPixels(buffer, ampi8i_phs8i))
{
throw std::runtime_error("Unable to convert pixels.");
}
const auto ampi8i_phs8i_ = sys::make_span(ampi8i_phs8i);
validate_buffer(ampi8i_phs8i_, info, data);

// Everything is kosher, point to the converted data
Expand Down Expand Up @@ -253,7 +254,7 @@ NewMemoryWriteHandler::NewMemoryWriteHandler(const NITFSegmentInfo& info,
if (data.getPixelType() == six::PixelType::AMP8I_PHS8I)
{
// Assume that buffer is really six::zfloat. If it is something else
// (e.g., std::pair<uint8_t, uint8_t> -- already converted) a different
// (e.g., AMP8I_PHS8I_t -- already converted) a different
// overload should be used. Since we've lost the actual buffer type,
// there not much else to do except hope for the best.
const void* pBuffer_ = buffer.data();
Expand Down Expand Up @@ -282,7 +283,7 @@ NewMemoryWriteHandler::NewMemoryWriteHandler(const NITFSegmentInfo& info,
}

NewMemoryWriteHandler::NewMemoryWriteHandler(const NITFSegmentInfo& info,
std::span<const std::pair<uint8_t, uint8_t>> buffer, size_t firstRow, const Data& data, bool doByteSwap)
std::span<const AMP8I_PHS8I_t> buffer, size_t firstRow, const Data& data, bool doByteSwap)
: NewMemoryWriteHandler(info, cast(buffer), firstRow, data, doByteSwap)
{
// This is for the uncommon case where the data is already in this format; normally, it is six::zfloat.
Expand Down
2 changes: 1 addition & 1 deletion six/modules/c++/six/source/NITFWriteControl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ static auto asBytes(BufferList::value_type pImageData,

// At this point, we've lost information about the ACTUAL size of the buffer. Normally, the computation above will be correct.
// But in the case of AMP8I_PHS8I (now supported), the buffer is actually RE32F_IM32F as the data is converted to
// six::zfloat when read-in, and converted to std::pair<uint8_t, uint8_t> when written-out.
// six::zfloat when read-in, and converted to AMP8I_PHS8I_t when written-out.
if (data.getPixelType() == six::PixelType::AMP8I_PHS8I)
{
size_in_bytes *= sizeof(float);
Expand Down

0 comments on commit b262f4a

Please sign in to comment.