Merge pull request #288 from sot/use-parsecm-load-dir-from-load-name

Use parse_cm load_dir_from_load_name and test

mica/starcheck/tests/test_catalog_fetches.py

@@ -11,6 +11,7 @@
 from Ska.quatutil import radec2yagzag, yagzag2radec
 
 from .. import starcheck
+from mica.utils import load_name_to_mp_dir
 
 HAS_SC_ARCHIVE = os.path.exists(starcheck.FILES["data_root"])
 
@@ -340,3 +341,8 @@ def test_get_starcheck_for_no_starcheck_entry():
     date = "2023:050:00:30:00"
     cat = starcheck.get_starcheck_catalog_at_date(date)
     assert cat is None
+
+
+def test_load_name_to_mp_dir():
+    mp_dir = load_name_to_mp_dir("DEC2506C")
+    assert mp_dir == "/2006/DEC2506/oflsc/"

mica/utils.py

@@ -1,7 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
-import os
-
-from kadi.commands.core import ska_load_dir
+from parse_cm.paths import load_dir_from_load_name
 
 DEFAULT_CONFIG = {}
 
@@ -13,6 +11,6 @@ def load_name_to_mp_dir(load_name):
     :returns: str mica-format mission planning dir
     """
     # Get the last 3 parts of the full load directory path YEAR/LOAD/ofls{REV}
-    dir_parts = ska_load_dir(load_name).parts
+    dir_parts = load_dir_from_load_name(load_name).parts
     out = "/" + "/".join(dir_parts[-3:]) + "/"
     return out