Merge branch 'main' of github.com:DOI-USGS/SpiceQL

DOI-USGS · Nov 4, 2024 · 8b5d5ab · 8b5d5ab
2 parents 012e6d8 + 1e155f3
commit 8b5d5ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/SpiceQL/db/mess.json b/SpiceQL/db/mess.json
@@ -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" : {

diff --git a/SpiceQL/src/spice_types.cpp b/SpiceQL/src/spice_types.cpp
@@ -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();
-      scs2e_c(frameCode, sclk.c_str(), &et);
-      checkNaifErrors();
-      SPDLOG_DEBUG("strsclktoet({}, {}, {}) -> {}", frameCode, mission, sclk, et);
-
+      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;
   }