Unverified Commit 8995649e authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Hayabusa2 conf (#24) 

* Added hayabusa2 onc configuration and tests

* Updated changelog

* Updated test to reflect new conf

* trigger build

* Updated json submodule

* Added preceding slash to hayabusa dep

* Updated megaconfig size in test
parent bcc03849

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ release. 
### Added

- Adds support for LO [#11](https://github.com/DOI-USGS/SpiceQL/issues/11)

- Adds support for Smart1 [#16](https://github.com/DOI-USGS/SpiceQL/issues/16)

- Adds support for Hayabusa2 ONC [#12](https://github.com/DOI-USGS/SpiceQL/issues/12)



### Fixed

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ if(SPICEQL_BUILD_LIB) 
                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/cassini.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/clem1.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/galileo.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/hayabusa2.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/juno.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kaguya.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/lro.json

SpiceQL/db/hayabusa.json

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
        "ik": {

            "kernels": ["amica31.ti"]

        },

        "deps" : ["hayabusa"]

        "deps" : ["/hayabusa"]

    },

    "nirs": {

        "spk" : {
@@ -47,6 +47,6 @@ 
        "ik": {

            "kernels": ["nirs10.ti"]

        },

        "deps" : ["hayabusa"]

        "deps" : ["/hayabusa"]

    }

}
 
 No newline at end of file

SpiceQL/db/hayabusa2.json

+12 −30
Original line number Diff line number Diff line
@@ -2,48 +2,30 @@ 
    "hayabusa2" : { 

        "ck" : { 

            "reconstructed" : { 

                "kernels" : ["hayabusa_itokawarendezvous_v02n.bc$"]    

                "kernels" : ["hyb2_.*_[0-9]{4}_v[0-9]{2}.bc"]    

            }

        },

        "dsk" : { 

            "kernels" : ["hay_a_amica_5_itokawashape_v1_0_512q.bds$", "hay_a_amica_5_itokawashape_v1_0_64q.bds$"]

        },

        "fk" : { 

            "kernels" : ["itokawa_fixed.tf$", "hayabusa_hp.tf$"]

        },

        "pck" : {

            "reconstructed" : { 

                "kernels" : ["itokawa_gaskell_n[0-9]{1}.tpc$"]

            }

            "kernels" : ["hyb2_v[0-9]{2}.tf$", "hyb2_ryugu_v[0-9]{2}.tf$", "hyb2_hp_v[0-9]{2}.tf$"]

        },

        "sclk" : { 

            "kernels" : ["hayabusa.tsc$"]

            "kernels" : ["hyb2_20141203-[0-9]{4}1231_v01.tsc$"]

        },

        "tspk" : { 

            "kernels" : ["sb_25143_140.bsp$", "de403s.bsp$"]

            "kernels" : ["de430.bsp$", "[0-9]{7}_ryugu_[0-9]{8}-[0-9]{8}_[0-9]{4}_[0-9]{8}.bsp$", "jup329.bsp", "sat375.bsp", "[0-9]{7}_Ryugu.bsp$", "[0-9]{7}_ryugu_[0-9]{8}-[0-9]{8}_[0-9]{4}_[0-9]{8}.bsp"]

        }

    },

    "amica" : {

        "ik" : { 

            "kernels" : ["amica[0-9]{2}.ti$"]

        }, 

        "iak" : {

            "kernels" : ["amicaAddendum[0-9]{3}.ti$"]

        },

        "spk" : { 

            "kernels" : ["hay_jaxa_050916_051119_v1n.bsp$", "hay_osbj_050911_051118_v1n.bsp$"]

        },

        "deps" : ["/hayabusa2"]

    },

    "nirs" : {

    "onc" : {

        "ik" : {

            "kernels" : ["nirs[0-9]{2}.ti$"]

            "kernels" : ["hyb2_onc_v[0-9]{2}.ti$"]

        },

        "iak" : {

            "kernels" : ["nirsAddendum[0-9]{3}.ti$"]

            "kernels" : ["hyb2oncAddendum[0-9]{4}.ti$"]

        },

        "spk" : {

            "kernels" : ["hay_jaxa_050916_051119_v1n.bsp$", "hayabusa_[0-9]{8}_[0-9]{8}_v[0-9]{2}.bsp$"]

            "reconstructed" : { 

                "kernels" : ["hyb2_[0-9]{8}-[0-9]{8}_[0-9]{4}[a-z]{1}_final_ver[0-9]{1}.oem.bsp$", "hyb2_hpk_[0-9]{8}_[0-9]{8}_v[0-9]{2}.bsp$", "hyb2_approach_od_v[0-9]{14}.bsp","lidar_derived_trj_[0-9]{8}_[0-9]{14}_[0-9]{14}_v[0-9]{2}.bsp$"]

            }

        },

        "deps" : ["/hayabusa2"]

    }

SpiceQL/tests/FunctionalTestsConfig.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ using namespace SpiceQL; 
TEST_F(TestConfig, FunctionalTestConfigConstruct) {

  json megaConfig = testConfig.globalConf();



  EXPECT_EQ(megaConfig.size(), 64);

  EXPECT_EQ(megaConfig.size(), 65);

}



TEST_F(TestConfig, FunctionalTestConfigEval) {