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

Voyager conf (#25) 

* Updated changelog

* Added voyager1 conf and tests

* Added voyager confs

* Added voyager2 to cmakelists

* Updated size of mega conf

* Added tests for voyager2

* Removed incorrect voyager kernels

* Updated changelog

* Updated tests and json config

* Updated to remove viking from this PR

* Updated size of megaconfig
parent 8995649e

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ release. 
- 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)

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



### Fixed

CMakeLists.txt

+4 −1
Original line number Diff line number Diff line
@@ -101,7 +101,10 @@ if(SPICEQL_BUILD_LIB) 
                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/smart1.json

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

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

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/viking2.json)

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

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

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

                           )



  set(SPICEQL_KERNELS ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kernels/naif0011.tls)

SpiceQL/db/voyager1.json

0 → 100644
+36 −0
Original line number Diff line number Diff line 
{

    "voyager1": {

        "ck": {

            "reconstructed": {

                "kernels": ["vg1_sat_qmw_[n,w]a_fc-31100_t2.bc","vg1_jup_qmw_[n,w]a_fc-31100_t2.bc$"]

            },

            "smithed": {

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

            }

        },

        "fk": { 

            "kernels": ["vg1_v[0-9]{2}.tf$"]

        },

        "iak": {

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

        },

       "ik": {

            "kernels": ["vg1_iss[w,n]a_v[0-9]{2}.ti$"]

        },

        "lsk": {

            "kernels": ["naif0009.tls$"]

        },

        "pck": {

            "kernels": ["pck00010_msgr_v23_europa2020.tpc$"]

        },

        "sclk": {

            "kernels": ["vg1[0-9]{5}.tsc$"]

        },

        "spk": {

            "reconstructed": {

                "kernels": ["vg1_sat.bsp$", "vg1_jup.bsp$", "vg1_[a-z]{3}_version[0-9]{1}_type[0-9]{1}_iss_sedr.bc$","vgr1_jup230.bsp$", "vgr1_sat336.bsp$"]

            }

        },

        "deps" : ["/base/pck"]

    }

}
 
 No newline at end of file

SpiceQL/db/voyager2.json

0 → 100644
+36 −0
Original line number Diff line number Diff line 
{

    "voyager2": {

        "ck": {

            "reconstructed": {

                "kernels": ["vg2_[a-z]{3}_qmw_[n,w]a_fc-32100_t2.bc$", "vg2_[a-z]{3}_qmw_[n,w]a_fc-32100.bc$", "vg2_[a-z]{3}_version1_type[0-9]_iss_sedr.bc$" ]

            },

            "smithed": {

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

            }

        },

        "fk": { 

            "kernels": ["vg2_v[0-9]{2}.tf$"]

        },

        "iak": {

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

        },

       "ik": {

            "kernels": ["vg2_iss[w,n]a_v[0-9]{2}.ti$"]

        },

        "lsk": {

            "kernels": ["naif0009.tls$"]

        },

        "pck": {

            "kernels": ["pck00010_msgr_v23_europa2020.tpc$"]

        },

        "sclk": {

            "kernels": ["vg2[0-9]{5}.tsc$"]

        },

        "spk": {

            "reconstructed": {

                "kernels": ["vg[r]?2_jup[0-9]{0,3}.bsp$", "vg[r]?2_sat[0-9]{0,3}.bsp$", "vg[r]?2_ura[0-9]{0,3}.bsp$", "vg[r]?2_nep[0-9]{0,3}.bsp$"]

            }

        },

        "deps" : ["/base/pck"]

    }

}
 
 No newline at end of file

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(), 65);

  EXPECT_EQ(megaConfig.size(), 67);

}



TEST_F(TestConfig, FunctionalTestConfigEval) {