From 057a2b8023f609d1d4e1e1676025e2e69aad4489 Mon Sep 17 00:00:00 2001 From: kelvinrr Date: Tue, 29 Oct 2024 21:07:12 +0000 Subject: [PATCH] removed searches --- SpiceQL/db/base.json | 3 +++ SpiceQL/src/spice_types.cpp | 1 + SpiceQL/src/utils.cpp | 8 +------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/SpiceQL/db/base.json b/SpiceQL/db/base.json index 9e40ac2..d67ae6a 100644 --- a/SpiceQL/db/base.json +++ b/SpiceQL/db/base.json @@ -31,6 +31,9 @@ }, "deps" : ["/base"] }, + "iau_moon" : { + "deps" : ["/moon"] + }, "neptune" : { "tspk" : { "noquality": { diff --git a/SpiceQL/src/spice_types.cpp b/SpiceQL/src/spice_types.cpp index a9fa046..d38e32b 100644 --- a/SpiceQL/src/spice_types.cpp +++ b/SpiceQL/src/spice_types.cpp @@ -331,6 +331,7 @@ namespace SpiceQL { baseKernels = Inventory::search_for_kernelset("base", {"fk"}); missionKernels = Inventory::search_for_kernelset(mission, {"fk"}); } + KernelSet baseKset(baseKernels); KernelSet missionKset(missionKernels); diff --git a/SpiceQL/src/utils.cpp b/SpiceQL/src/utils.cpp index a9bf76a..bdeda70 100644 --- a/SpiceQL/src/utils.cpp +++ b/SpiceQL/src/utils.cpp @@ -452,19 +452,13 @@ namespace SpiceQL { } json ephemKernels = {}; - json lskKernels = {}; - json pckKernels = {}; if (searchKernels) { - ephemKernels = Inventory::search_for_kernelsets({mission, "base"}, {"sclk", "ck", "pck", "fk", "tspk", "lsk", "pck", "tspk"}, ets.front(), ets.back(), ckQuality, "noquality"); - lskKernels = Inventory::search_for_kernelset("base", {"lsk"}); - pckKernels = Inventory::search_for_kernelset("base", {"pck"}); + ephemKernels = Inventory::search_for_kernelsets({mission, "base"}, {"sclk", "ck", "pck", "fk", "tspk", "lsk", "tspk"}, ets.front(), ets.back(), ckQuality, "noquality"); } auto start = high_resolution_clock::now(); KernelSet ephemSet(ephemKernels); - KernelSet lskSet(lskKernels); - KernelSet pckSet(pckKernels); auto stop = high_resolution_clock::now(); auto duration = duration_cast(stop - start); SPDLOG_INFO("Time in microseconds to furnish kernel sets: {}", duration.count()); -- GitLab