diff --git a/SpiceQL/db/lro.json b/SpiceQL/db/lro.json
index 1570bdcabbbf46453bdfdd46ed5a519bdb3e6cda..57aebcf1938f70c196cfc058b35be0029d02c9a1 100644
--- a/SpiceQL/db/lro.json
+++ b/SpiceQL/db/lro.json
@@ -1,8 +1,5 @@
{
"lro" : {
- "ik" : {
- "kernels" : ["lro_instruments_v[0-9]{2}.ti$"]
- },
"iak" : {
"kernels" : ["lro_instrumentAddendum_v[0-9]{2}.ti$"]
},
@@ -16,12 +13,12 @@
"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$"]
}
},
"spk" : {
"reconstructed" : {
- "kernels" : ["fdf29r?_[0-9]{7}_[0-9]{7}_[nbv][0-9]{2}.bsp$"]
+ "kernels" : ["fdf29r_[0-9]{7}_[0-9]{7}_[nbv][0-9]{2}.bsp$"]
},
"smithed" : {
"kernels" : ["LRO_.*_GRGM660.*.bsp$", "LRO_.*_GRGM900C.*.BSP$"]
@@ -39,7 +36,7 @@
}
},
"tspk" : {
- "kernels" : ["de421.bsp$", "moon_pa_de421_1900-2050.bpc$"]
+ "kernels" : ["^de421.bsp$", "moon_pa_de421_1900-2050.bpc$"]
},
"ik" : {
"kernels" : ["lro_lroc_v[0-9]{2}.ti$"]
diff --git a/SpiceQL/src/inventoryimpl.cpp b/SpiceQL/src/inventoryimpl.cpp
index d3848eb6c9dafc01cfe6d15d6846b0e0875cccb6..52416aa7f2d5c23e3f097a6dea04cd7989146e5f 100644
--- a/SpiceQL/src/inventoryimpl.cpp
+++ b/SpiceQL/src/inventoryimpl.cpp
@@ -42,7 +42,9 @@ namespace SpiceQL {
string DB_START_TIME_KEY = "starttime";
string DB_STOP_TIME_KEY = "stoptime";
string DB_TIME_FILES_KEY = "path_index";
- string DB_SS_TIME_INDICES_KEY = "ss_index";
+ string DB_START_TIME_INDICES_KEY = "start_kindex";
+ string DB_STOP_TIME_INDICES_KEY = "stop_kindex";
+
string getCacheDir() {
static std::string CACHE_DIRECTORY = "";
@@ -90,7 +92,7 @@ namespace SpiceQL {
json timeJson = conf.getRecursive(type);
json ckKernelGrp = timeJson[type][quality]["kernels"];
-
+
for(auto &arr : ckKernelGrp) {
for(auto &subArr : arr) {
for (auto &kernel : subArr) {
@@ -141,15 +143,19 @@ namespace SpiceQL {
json json_kernels = getLatestKernels(config.get());
// load time kernels for creating the timed kernel DataBase
- json sclk_json = getLatestKernels(config.getRecursive("sclk"));
- json lsk_json = getLatestKernels(config.getRecursive("lsk"));
-
- m_required_kernels.load(sclk_json);
+ json lsk_json = getLatestKernels(config["base"].getRecursive("lsk"));
+
+ SPDLOG_TRACE("InventoryImpl LSKs: {}", lsk_json.dump(4));
+
m_required_kernels.load(lsk_json);
for (auto &[mission, kernels] : json_kernels.items()) {
fmt::print("mission: {}\n", mission);
+ json sclk_json = getLatestKernels(config[mission].getRecursive("sclk"));
+ SPDLOG_TRACE("{} SCLKs: {}", mission, sclk_json.dump(4));
+ KernelSet sclks_ks(sclk_json);
+
for(auto &[kernel_type, kernel_obj] : kernels.items()) {
if (kernel_type == "ck" || kernel_type == "spk") {
// we need to log the times
@@ -272,15 +278,18 @@ namespace SpiceQL {
vector<double> start_times_v = getKey<vector<double>>(DB_SPICE_ROOT_KEY+"/"+key+"/"+DB_START_TIME_KEY);
vector<double> stop_times_v = getKey<vector<double>>(DB_SPICE_ROOT_KEY+"/"+key+"/"+DB_STOP_TIME_KEY);
- vector<size_t> file_index_v = getKey<vector<size_t>>(DB_SPICE_ROOT_KEY+"/"+key+"/"+DB_SS_TIME_INDICES_KEY);
+ vector<size_t> start_file_index_v = getKey<vector<size_t>>(DB_SPICE_ROOT_KEY+"/"+key+"/"+DB_START_TIME_INDICES_KEY);
+ vector<size_t> stop_file_index_v = getKey<vector<size_t>>(DB_SPICE_ROOT_KEY+"/"+key+"/"+DB_STOP_TIME_INDICES_KEY);
vector<string> file_paths_v = getKey<vector<string>>(DB_SPICE_ROOT_KEY+"/"+key+"/"+DB_TIME_FILES_KEY);
time_indices->file_paths = file_paths_v;
- SPDLOG_TRACE("Index, start time, stop time sizes: {}, {}, {}", file_index_v.size(), start_times_v.size(), stop_times_v.size());
+ SPDLOG_TRACE("Index, start time, stop time sizes: {}, {}, {}", start_file_index_v.size(), start_times_v.size(), stop_times_v.size());
// load start_times
for(size_t i = 0; i < start_times_v.size(); i++) {
- time_indices->start_times[start_times_v[i]] = file_index_v[i];
- time_indices->stop_times[stop_times_v[i]] = file_index_v[i];
+ time_indices->start_times[start_times_v[i]] = start_file_index_v[i];
+ }
+ for(size_t i = 0; i < stop_times_v.size(); i++) {
+ time_indices->stop_times[stop_times_v[i]] = stop_file_index_v[i];
}
}
catch (runtime_error &e) {
@@ -313,6 +322,7 @@ namespace SpiceQL {
}
for(auto it = time_indices->start_times.begin() ;it != start_upper_bound; it++) {
iterations++;
+ SPDLOG_TRACE("Inserting {} with the start time {}", time_indices->file_paths.at(it->second), it->first);
start_time_kernels.insert(it->second);
}
@@ -320,15 +330,15 @@ namespace SpiceQL {
// Get everything stopping after the start_time;
auto stop_lower_bound = time_indices->stop_times.lower_bound(start_time);
- SPDLOG_TRACE("IS {} in the array? {}", stop_lower_bound->second, start_time_kernels.contains(stop_lower_bound->second));
if(time_indices->stop_times.end() == stop_lower_bound && stop_lower_bound->first >= stop_time && start_time_kernels.contains(stop_lower_bound->second)) {
+ SPDLOG_TRACE("Is {} in the array? {}", stop_lower_bound->second, start_time_kernels.contains(stop_lower_bound->second));
final_time_kernels.push_back(time_indices->file_paths.at(stop_lower_bound->second));
}
else {
- for(auto &it = stop_lower_bound;it != time_indices->stop_times.end(); it++) {
+ for(auto it = stop_lower_bound;it != time_indices->stop_times.end(); it++) {
// if it's also in the start_time set, add it to the list
iterations++;
- SPDLOG_TRACE("IS {} in the array? {}", it->second, start_time_kernels.contains(it->second));
+ SPDLOG_TRACE("Is {} with stop time {} in the array? {}", time_indices->file_paths.at(it->second), it->first, start_time_kernels.contains(it->second));
if (start_time_kernels.contains(it->second)) {
final_time_kernels.push_back(data_dir / time_indices->file_paths.at(it->second));
}
@@ -394,21 +404,26 @@ namespace SpiceQL {
start_times_v.reserve(kernels->start_times.size());
vector<double> stop_times_v;
stop_times_v.reserve(kernels->stop_times.size());
- vector<size_t> indices_v;
- indices_v.reserve(kernels->start_times.size());
+ vector<size_t> start_indices_v;
+ start_indices_v.reserve(kernels->start_times.size());
+ vector<size_t> stop_indices_v;
+ stop_indices_v.reserve(kernels->stop_times.size());
+
for (const auto &[k, v] : kernels->start_times) {
start_times_v.push_back(k);
- indices_v.push_back(v);
+ start_indices_v.push_back(v);
}
for (const auto &[k, v] : kernels->stop_times) {
stop_times_v.push_back(k);
+ stop_indices_v.push_back(v);
}
H5Easy::dump(file, DB_SPICE_ROOT_KEY + "/"+kernel_key+"/"+DB_START_TIME_KEY, start_times_v, H5Easy::DumpMode::Overwrite);
H5Easy::dump(file, DB_SPICE_ROOT_KEY + "/"+kernel_key+"/"+DB_STOP_TIME_KEY, stop_times_v, H5Easy::DumpMode::Overwrite);
- H5Easy::dump(file, DB_SPICE_ROOT_KEY + "/"+kernel_key+"/"+DB_SS_TIME_INDICES_KEY, indices_v, H5Easy::DumpMode::Overwrite);
+ H5Easy::dump(file, DB_SPICE_ROOT_KEY + "/"+kernel_key+"/"+DB_START_TIME_INDICES_KEY, start_indices_v, H5Easy::DumpMode::Overwrite);
+ H5Easy::dump(file, DB_SPICE_ROOT_KEY + "/"+kernel_key+"/"+DB_STOP_TIME_INDICES_KEY, stop_indices_v, H5Easy::DumpMode::Overwrite);
}
}
diff --git a/SpiceQL/src/query.cpp b/SpiceQL/src/query.cpp
index e8694da75b7dbd1fdeaf479ccdad531334454bd5..a03c0e156e371c3a14d88ca8ee64fb94031b7b17 100644
--- a/SpiceQL/src/query.cpp
+++ b/SpiceQL/src/query.cpp
@@ -230,6 +230,13 @@ namespace SpiceQL {
}
if (pointers.empty() && kernels.is_object()) {
// Assume it's in the format {"sclk" : ["path1", "path2"], "ck" : ["path1"], ...}
+
+ json iaks = {};
+ // we want to furnish them last
+ if(kernels.contains("iak")) {
+ iaks = kernels["iak"];
+ kernels.erase("iak");
+ }
for (auto& [key, val] : kernels.items()) {
SPDLOG_TRACE("Getting Kernels of Type: {}", key);
if(!val.empty()) {
@@ -240,6 +247,16 @@ namespace SpiceQL {
}
}
}
+
+ // add iaks at the end
+ if(!iaks.empty()) {
+ vector<string> ks = jsonArrayToVector(iaks);
+ for (auto &kernel : ks) {
+ SPDLOG_TRACE("Adding: {}", kernel);
+ kernelVect.push_back(kernel);
+ }
+ }
+
}
else {
for (auto & p : pointers) {
diff --git a/SpiceQL/src/utils.cpp b/SpiceQL/src/utils.cpp
index e6392e5d22114d316f63504adce7b1bfd20db033..6cb354ed2ec209a7b7d7bb9d9e3b755711d22cdc 100644
--- a/SpiceQL/src/utils.cpp
+++ b/SpiceQL/src/utils.cpp
@@ -176,6 +176,8 @@ namespace SpiceQL {
vector<double> getTargetState(double et, string target, string observer, string frame, string abcorr) {
+ SPDLOG_TRACE("getTargetState(et={}, target={}, observer={}, frame={}, abcorr={})", et, target, observer, frame, abcorr);
+
// convert params to spice types
ConstSpiceChar *target_spice = target.c_str(); // better way to do this?
ConstSpiceChar *observer_spice = observer.c_str();
@@ -185,7 +187,6 @@ namespace SpiceQL {
// define outputs
SpiceDouble lt;
SpiceDouble starg_spice[6];
-
checkNaifErrors();
spkezr_c( target_spice, et, frame_spice, abcorr_spice, observer_spice, starg_spice, < );
checkNaifErrors();
@@ -208,26 +209,19 @@ namespace SpiceQL {
}
json ephemKernels = {};
- json lskKernels = {};
- json pckKernels = {};
- json spkKernels = {};
+ json baseKernels = {};
if (searchKernels) {
- ephemKernels = Inventory::search_for_kernelset(mission, {"sclk", "ck", "spk", "pck", "tspk"}, ets.front(), ets.back(), ckQuality, spkQuality);
- lskKernels = Inventory::search_for_kernelset("base", {"lsk"});
- pckKernels = Inventory::search_for_kernelset("base", {"pck"});
- spkKernels = Inventory::search_for_kernelset("base", {"spk"}, ets.front(), ets.back(), "noquality", "noquality");
- SPDLOG_DEBUG("LSK Kernels : {}", lskKernels.dump(4));
+ ephemKernels = Inventory::search_for_kernelset(mission, {"sclk", "ck", "spk", "pck", "tspk", "fk"}, ets.front(), ets.back(), ckQuality, spkQuality);
+ baseKernels = Inventory::search_for_kernelset("base", {"lsk", "pck", "spk"});
+ SPDLOG_DEBUG("Base Kernels : {}", baseKernels.dump(4));
SPDLOG_DEBUG("{} Kernels : {}", mission, ephemKernels.dump(4));
- SPDLOG_DEBUG("PCK Kernels : {}", pckKernels.dump(4));
- SPDLOG_DEBUG("SPK Kernels : {}", spkKernels.dump(4));
}
auto start = high_resolution_clock::now();
+ KernelSet baseSet(baseKernels);
KernelSet ephemSet(ephemKernels);
- KernelSet lskSet(lskKernels);
- KernelSet pckSet(pckKernels);
- KernelSet spkSet(spkKernels);
+
auto stop = high_resolution_clock::now();
auto duration = duration_cast<microseconds>(stop - start);
SPDLOG_INFO("Time in microseconds to furnish kernel sets: {}", duration.count());
@@ -1102,7 +1096,7 @@ namespace SpiceQL {
ssize_c(200000, &cover);
// A SPICE SEGMENT is composed of SPICE INTERVALS
- ckcov_c(kpath.c_str(), body, SPICEFALSE, "SEGMENT", 0.0, "TDB", &cover);
+ ckcov_c(kpath.c_str(), body, SPICEFALSE, "INTERVAL", 0.0, "TDB", &cover);
getStartStopFromInterval(cover);
}
diff --git a/bindings/python/pyspiceql.i b/bindings/python/pyspiceql.i
index 1100ec1767694e222c42b2672361372b4e94272f..80cd1f042dea2d9d941520ab52eb77fd2a8da6fb 100644
--- a/bindings/python/pyspiceql.i
+++ b/bindings/python/pyspiceql.i
@@ -16,6 +16,9 @@
#include <vector>
%}
+%template(DoublePair) std::pair<double, double>;
+
+
%typemap(in) nlohmann::json {
if (PyDict_Check($input) || PyList_Check($input)) {
PyObject* module = PyImport_ImportModule("json");