Unverified Commit 1e155f3c authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

SCLK Bug fixes (#44) 

* fixed bug where cks were using interval scope

* fixed sclk bugs
parent 384910e1

SpiceQL/db/mess.json

+3 −2
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ 
            "kernels" : "pck00010_msgr_v[0-9]{2}.tpc"

          }

        },

        "deps" : ["/mdis_att", "/messenger"]

        "deps" : ["/mdis_att"]

    },

    "mdis_att" : {

        "ck" : {

            "reconstructed" : {

              "kernels" : "msgr_mdis_sc[0-9]{6}_[0-9]{6}_sub_v[0-9]{1}.bc"

            }

        }

        },

        "deps" : ["/messenger"]

    },

    "messenger" : {

        "ck" : {

SpiceQL/src/spice_types.cpp

+12 −7
Original line number Diff line number Diff line
@@ -236,15 +236,20 @@ namespace SpiceQL { 
      KernelSet sclkSet(sclks);

      KernelSet lskSet(lsks);

      

      // we want the platforms code, if they passs in an instrument code (e.g. -85600), truncate it to (-85)

      frameCode = (abs(frameCode / 1000) > 0) ? frameCode/1000 : frameCode; 



      SpiceDouble et;

      checkNaifErrors();

      try {

        scs2e_c(frameCode, sclk.c_str(), &et);

        checkNaifErrors();

        SPDLOG_DEBUG("strsclktoet({}, {}, {}) -> {}", frameCode, mission, sclk, et);

      

      }

      catch(exception &e) { 

        // we want the platforms code, if they passs in an instrument code (e.g. -85600), truncate it to (-85)

        frameCode = (abs(frameCode / 1000) > 0) ? frameCode/1000 : frameCode;

        scs2e_c(frameCode, sclk.c_str(), &et);

        checkNaifErrors();

        SPDLOG_DEBUG("strsclktoet({}, {}, {}) -> {}", frameCode, mission, sclk, et); 

      }

      return et;

  }