Commit ed591f29 authored by kelvinrr's avatar kelvinrr
Browse files

merge conflicts

parents 624629af d34f193d

SpiceQL/db/cassini.json

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
    },

    "iak": {

      "kernels": [

        "vimsAddendum[0-9]{2}.ti",

        "IssNAAddendum[0-9]{3}.ti",

        "IssWAAddendum[0-9]{3}.ti"

        "^vimsAddendum[0-9]{2}.ti$",

        "^IssNAAddendum[0-9]{3}.ti$",

        "^IssWAAddendum[0-9]{3}.ti$"

      ]

    },

    "pck": {

SpiceQL/src/spice_types.cpp

+4 −0
Original line number Diff line number Diff line
@@ -75,7 +75,11 @@ namespace SpiceQL { 




  Kernel::Quality Kernel::translateQuality(string qa) {

    if (qa.empty()) {

      qa = "smithed";

    }

    auto res = findInVector<string>(KERNEL_QUALITIES, qa);

    

    if (res.first) {

      return static_cast<Kernel::Quality>(res.second);

    }

SpiceQL/src/utils.cpp

+3 −7
Original line number Diff line number Diff line
@@ -209,17 +209,13 @@ namespace SpiceQL { 
    }



    json ephemKernels = {};

    json baseKernels = {};



    if (searchKernels) {

      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));

      ephemKernels = Inventory::search_for_kernelsets({mission, observer, "base"}, {"sclk", "ck", "spk", "pck", "tspk", "fk", "lsk", "fk"}, ets.front(), ets.back(), ckQuality, spkQuality);

      SPDLOG_DEBUG("{} Kernels : {}", mission, ephemKernels.dump(4));

    }



    auto start = high_resolution_clock::now();

    KernelSet baseSet(baseKernels);

    KernelSet ephemSet(ephemKernels);



    auto stop = high_resolution_clock::now();
@@ -460,7 +456,7 @@ namespace SpiceQL { 
    json pckKernels = {};



    if (searchKernels) {

      ephemKernels = Inventory::search_for_kernelset(mission, {"sclk", "ck", "pck", "fk", "tspk"}, ets.front(), ets.back(), ckQuality, "noquality");

      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"});

    }
@@ -952,7 +948,7 @@ namespace SpiceQL { 
    //this resizing is done because otherwise a spice cell will append new data

    //to the last "currCell"

    ssize_c(0, &currCell);

    ssize_c(100, &currCell);

    ssize_c(200000, &currCell);



    SPICEDOUBLE_CELL(cover, 200000);