Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
+ 1
− 0
View file @ ec13eed8
......@@ -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
View file @ ec13eed8
......@@ -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
View file @ ec13eed8
{
"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
View file @ ec13eed8
{
"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
View file @ ec13eed8
......@@ -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) {
......
SpiceQL/tests/QueryTests.cpp
+ 82
− 0
View file @ ec13eed8
......@@ -679,7 +679,89 @@ TEST_F(IsisDataDirectory, FunctionalTestListMissionKernelsHayabusa2) {
expected = {"hyb2oncAddendum0001.ti"};
CompareKernelSets(getKernelsAsVector(res.at("onc").at("iak")), expected);
}
TEST_F(IsisDataDirectory, FunctionalTestListMissionKernelsVoyager1) {
fs::path dbPath = getMissionConfigFile("voyager1");
compareKernelSets("voyager1");
ifstream i(dbPath);
nlohmann::json conf = nlohmann::json::parse(i);
MockRepository mocks;
mocks.OnCallFunc(ls).Return(files);
nlohmann::json res = listMissionKernels("doesn't matter", conf);
set<string> kernels = getKernelsAsSet(res);
set<string> mission = missionMap.at("voyager1");
vector<string> expected = {"vg1_jup_qmw_wa_fc-31100_t2.bc", "vg1_jup_qmw_na_fc-31100_t2.bc", "vg1_sat_qmw_wa_fc-31100_t2.bc", "vg1_sat_qmw_na_fc-31100_t2.bc"};
CompareKernelSets(getKernelsAsVector(res.at("voyager1").at("ck").at("reconstructed")), expected);
expected = {"vg1_eur_usgs2020.bc"};
CompareKernelSets(getKernelsAsVector(res.at("voyager1").at("ck").at("smithed")), expected);
expected = {"vg100010.tsc", "vg100008.tsc"};
CompareKernelSets(getKernelsAsVector(res.at("voyager1").at("sclk")), expected);
expected = {"vg1_issna_v02.ti", "vg1_isswa_v01.ti"};
CompareKernelSets(getKernelsAsVector(res.at("voyager1").at("ik")), expected);
expected = {"vg1_sat.bsp", "vgr1_jup230.bsp", "vg1_sat.bsp"};
CompareKernelSets(getKernelsAsVector(res.at("voyager1").at("spk").at("reconstructed")), expected);
expected = {"vg1_v02.tf"};
CompareKernelSets(getKernelsAsVector(res.at("voyager1").at("fk")), expected);
}
TEST_F(IsisDataDirectory, FunctionalTestListMissionKernelsVoyager2) {
fs::path dbPath = getMissionConfigFile("voyager2");
compareKernelSets("voyager2");
ifstream i(dbPath);
nlohmann::json conf = nlohmann::json::parse(i);
MockRepository mocks;
mocks.OnCallFunc(ls).Return(files);
nlohmann::json res = listMissionKernels("doesn't matter", conf);
set<string> kernels = getKernelsAsSet(res);
set<string> mission = missionMap.at("voyager2");
vector<string> expected = { "vg2_jup_qmw_wa_fc-32100_t2.bc",
"vg2_nep_version1_type1_iss_sedr.bc",
"vg2_ura_version1_type2_iss_sedr.bc",
"vg2_sat_qmw_na_fc-32100_t2.bc",
"vg2_jup_version1_type1_iss_sedr.bc",
"vg2_ura_version1_type1_iss_sedr.bc",
"vg2_jup_version1_type2_iss_sedr.bc",
"vg2_sat_version1_type1_iss_sedr.bc",
"vg2_jup_qmw_na_fc-32100_t2.bc",
"vg2_sat_version1_type2_iss_sedr.bc",
"vg2_sat_qmw_wa_fc-32100_t2.bc",
"vg2_nep_version1_type2_iss_sedr.bc"};
CompareKernelSets(getKernelsAsVector(res.at("voyager2").at("ck").at("reconstructed")), expected);
expected = {"vg2_eur_usgs2020.bc"};
CompareKernelSets(getKernelsAsVector(res.at("voyager2").at("ck").at("smithed")), expected);
expected = {"vg200010.tsc", "vg200011.tsc" "vg200008.tsc"};
CompareKernelSets(getKernelsAsVector(res.at("voyager2").at("sclk")), expected);
expected = {"vg1_issna_v02.ti", "vg1_isswa_v01.ti"};
CompareKernelSets(getKernelsAsVector(res.at("voyager2").at("ik")), expected);
expected = {"vg2_sat.bsp", "vgr2_jup230.bsp", "vg2_sat.bsp", "vg2_nep.bsp", "vg2_ura.bsp" "vgr2_nep081.bsp", "vgr2_sat336.bsp"};
CompareKernelSets(getKernelsAsVector(res.at("voyager2").at("spk").at("reconstructed")), expected);
expected = {"vg2_v02.tf"};
CompareKernelSets(getKernelsAsVector(res.at("voyager2").at("fk")), expected);
}
SpiceQL/tests/data/isisKernelList.txt
+ 0
− 15
View file @ ec13eed8
......@@ -22,21 +22,14 @@
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_qmw_wa_fc-32100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_nep_version1_type1_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_eur_usgs2020.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_qmw_wa.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_qmw_wa_fc-32100.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_qmw_wa_fc-32100.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_ura_version1_type2_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_qmw_wa.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_qmw_na_fc-32100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_version1_type1_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_qmw_na.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_ura_version1_type1_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_qmw_na_fc-32100.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_version1_type2_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_version1_type1_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_jup_qmw_na_fc-32100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_version1_type2_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_qmw_na.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_sat_qmw_wa_fc-32100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/ck/vg2_nep_version1_type2_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager2/kernels/sclk/vg200010.tsc
......@@ -9071,22 +9064,14 @@
/usgs/cpkgs/isis3/isis_data/chandrayaan1/kernels/fk/chand1_v001.tf
/usgs/cpkgs/isis3/isis_data/chandrayaan1/kernels/fk/chand1_vexcel.tf
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_version1_type1_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_qmw_wa_fc-31100.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_qmw_wa_fc-31100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_version1_type2_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_qmw_wa_fc-31100.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_qmw_na_fc-31100.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_eur_usgs2020.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_qmw_wa.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_qmw_na.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_version1_type2_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_qmw_wa.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_qmw_na_fc-31100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_qmw_na_fc-31100.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_qmw_wa_fc-31100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_version1_type1_iss_sedr.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_sat_qmw_na_fc-31100_t2.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ck/vg1_jup_qmw_na.bc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/sclk/vg100010.tsc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/sclk/vg100008.tsc
/usgs/cpkgs/isis3/isis_data/voyager1/kernels/ik/vg1_issna_v02.ti
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment