Skip to content

Fix lro.db #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kelvinrr merged 3 commits into from
Apr 22, 2026
Merged

Fix lro.db #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed9555f
fix lro db
chkim-usgs Apr 21, 2026
d7eba1e
update changelog
chkim-usgs Apr 21, 2026
61b39c4
add test
chkim-usgs Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ release.
-->
### unreleased

### Fixed
- Fixed LRO smithed kernels for north and south pole database by moving them from lroc to moc [#124](https://github.com/DOI-USGS/SpiceQL/pull/124)

### 1.3.0

### Changed
Expand Down
8 changes: 4 additions & 4 deletions SpiceQL/db/lro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
"moc" : {
"ck" : {
"reconstructed" : {
"kernels": ["moc42r?_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$"]
"kernels": ["moc42r?_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$"]
},
"smithed" : {
"kernels": ["LROC_NPOLE_2017Merged_Lidar2Image_.*_ck.bc$","LRONAC_SPole_.*_ck.bc$"]
}
},
"spk" : {
Expand All @@ -35,9 +38,6 @@
"ck" : {
"reconstructed" : {
"kernels" : [ "soc31_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$", "lrolc_[0-9]{7}_[0-9]{7}_v[0-9]{2}.bc$"]
},
"smithed" : {
"kernels": ["LROC_NPOLE_2017Merged_Lidar2Image_.*_ck.bc$","LRONAC_SPole_.*_ck.bc$"]
}
},
"ik" : {
Expand Down
36 changes: 22 additions & 14 deletions SpiceQL/tests/Fixtures.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,33 +355,41 @@ void LroKernelSet::SetUp() {
"moc" : {
"ck" : {
"reconstructed" : {
"kernels": ["soc31.*.bc", "lrolc.*.bc"]
"kernels": [
"soc31.*.bc",
"lrolc.*.bc",
"LROC_NPOLE_.*_ck.bc",
"LRONAC_SPole_.*_ck.bc"]
},
"deps" : {
"sclk" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"],
"objs" : ["/base/lsk", "/moc/sclk"]
}
},
"spk" : {
"reconstructed" : {
"kernels" : ["fdf29_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp", "fdf29r_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp"]
},
"smithed" : {
"kernels" : ["LRO_.*_GRGM660.*.bsp", "LRO_.*_GRGM900C.*.BSP"]
},
"deps" : {
"sclk" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"],
"objs" : ["/base/lsk", "/moc/sclk"]
}
"reconstructed" : {
"kernels" : ["fdf29_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp", "fdf29r_[0-9]{7}_[0-9]{7}_[0-9]{3}.bsp"]
},
"smithed" : {
"kernels" : [
"LRO_.*_GRGM660.*.bsp",
"LRO_.*_GRGM900C.*.BSP",
"LROC_NPOLE_.*_spk.bsp",
"LRONAC_SPole_.*_spk.bsp"]
},
"deps" : {
"sclk" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"],
"objs" : ["/base/lsk", "/moc/sclk"]
}
},
"sclk" : {
"kernels" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"]
"kernels" : ["lro_clkcor_[0-9]{7}_v[0-9]{2}.tsc"]
},
"fk" : {
"kernels" : ["lro_frames_[0-9]{7}_v[0-9]{2}.tf"]
"kernels" : ["lro_frames_[0-9]{7}_v[0-9]{2}.tf"]
},
"ik" : {
"kernels" : ["lro_instruments_v[0-9]{2}.ti"]
"kernels" : ["lro_instruments_v[0-9]{2}.ti"]
}
}
})"_json;
Expand Down
21 changes: 18 additions & 3 deletions SpiceQL/tests/QueryTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,20 @@ TEST_F(IsisDataDirectory, FunctionalTestLroConf) {
// check a kernel from each regex exists in their quality groups
vector<string> kernelToCheck = SpiceQL::getKernelsAsVector(res.at("moc").at("ck").at("reconstructed").at("kernels"));
vector<string> expected = {tempDir/"lro"/"kernels"/ "ck" / "moc42r_2016305_2016336_v01.bc"};
SPDLOG_DEBUG("Checking CKs");
SPDLOG_DEBUG("Checking Recon CKs");
for (auto &e : expected) {
auto it = find(kernelToCheck.begin(), kernelToCheck.end(), e);
if (it == kernelToCheck.end()) {
throw runtime_error(e+" was not found in the kernel results");
}
}

SPDLOG_DEBUG("Checking Smithed CKs");
kernelToCheck = SpiceQL::getKernelsAsVector(res.at("moc").at("ck").at("smithed").at("kernels"));
expected = {
tempDir/"lro"/"kernels"/ "ck" /"LROC_NPOLE_2017Merged_Lidar2Image_Left_ck.bc",
tempDir/"lro"/"kernels"/ "ck" /"LRONAC_SPole_LE_2009_ck.bc"
};
for (auto &e : expected) {
auto it = find(kernelToCheck.begin(), kernelToCheck.end(), e);
if (it == kernelToCheck.end()) {
Expand All @@ -268,8 +281,10 @@ TEST_F(IsisDataDirectory, FunctionalTestLroConf) {
SPDLOG_DEBUG("Checking Smithed SPKs");
kernelToCheck = getKernelsAsVector(res.at("moc").at("spk").at("smithed"));
expected = {tempDir/"lro"/"kernels"/ "spk" /"LRO_ES_05_201308_GRGM660PRIMAT270.bsp",
tempDir/"lro"/"kernels"/ "spk" /"LRO_ES_16_201406_GRGM900C_L600.BSP"};

tempDir/"lro"/"kernels"/ "spk" /"LRO_ES_16_201406_GRGM900C_L600.BSP",
tempDir/"lro"/"kernels"/ "spk" /"LROC_NPOLE_2017Merged_Lidar2Image_Left_spk.bsp",
tempDir/"lro"/"kernels"/ "spk" /"LRONAC_SPole_RE_2013_spk.bsp"
};
for (auto &e : expected) {
auto it = find(kernelToCheck.begin(), kernelToCheck.end(), e);
if (it == kernelToCheck.end()) {
Expand Down
48 changes: 48 additions & 0 deletions SpiceQL/tests/data/isisKernelList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12220,6 +12220,30 @@ lro/kernels/ck/lrolc_2021151_2021182_v01.bc
lro/kernels/ck/lrolc_2019334_2020001_v01.bc
lro/kernels/ck/lrolc_2013273_2013305_v06.bc
lro/kernels/ck/moc42r_2017181_2017213_v01.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2009_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2010_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2011_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2012_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2013_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_2014_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Left_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2009_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2010_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2011_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2012_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2013_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_2014_ck.bc
lro/kernels/ck/LROC_NPOLE_2017Merged_Lidar2Image_Right_ck.bc
lro/kernels/ck/LRONAC_SPole_LE_2009_ck.bc
lro/kernels/ck/LRONAC_SPole_LE_2010_ck.bc
lro/kernels/ck/LRONAC_SPole_LE_2011_ck.bc
lro/kernels/ck/LRONAC_SPole_LE_2012_ck.bc
lro/kernels/ck/LRONAC_SPole_LE_2013_ck.bc
lro/kernels/ck/LRONAC_SPole_RE_2009_ck.bc
lro/kernels/ck/LRONAC_SPole_RE_2010_ck.bc
lro/kernels/ck/LRONAC_SPole_RE_2011_ck.bc
lro/kernels/ck/LRONAC_SPole_RE_2012_ck.bc
lro/kernels/ck/LRONAC_SPole_RE_2013_ck.bc
lro/kernels/sclk/lro_clkcor_2021271_v00.tsc
lro/kernels/sclk/lro_clkcor_2021299_v00.tsc
lro/kernels/sclk/lro_clkcor_2021265_v00.tsc
Expand Down Expand Up @@ -12509,6 +12533,30 @@ lro/kernels/spk/LRO_ES_16_201406_GRGM900C_L600.BSP
lro/kernels/spk/fdf29_2021327_2021328_b01.bsp
lro/kernels/spk/LRO_ES_05_201308_GRGM660PRIMAT270.bsp
lro/kernels/spk/fdf29r_2014335_2015001_v01.bsp
lro/kernels/spk/LRONAC_SPole_LE_2009_spk.bsp
lro/kernels/spk/LRONAC_SPole_LE_2010_spk.bsp
lro/kernels/spk/LRONAC_SPole_LE_2011_spk.bsp
lro/kernels/spk/LRONAC_SPole_LE_2012_spk.bsp
lro/kernels/spk/LRONAC_SPole_LE_2013_spk.bsp
lro/kernels/spk/LRONAC_SPole_RE_2009_spk.bsp
lro/kernels/spk/LRONAC_SPole_RE_2010_spk.bsp
lro/kernels/spk/LRONAC_SPole_RE_2011_spk.bsp
lro/kernels/spk/LRONAC_SPole_RE_2012_spk.bsp
lro/kernels/spk/LRONAC_SPole_RE_2013_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2009_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2010_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2011_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2012_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2013_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_2014_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Left_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2009_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2010_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2011_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2012_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2013_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_2014_spk.bsp
lro/kernels/spk/LROC_NPOLE_2017Merged_Lidar2Image_Right_spk.bsp
lro/kernels/fk/lro_frames_2009322_v01.tf
lro/kernels/fk/lro_frames_2010277_v01.tf
lro/kernels/fk/lro_frames_2009171_v01.tf
Expand Down
Loading