Lo and HIT - SIT-4 Bug fixes (IMAP-Science-Operations-Center#1818)

* fixed l1a dependency check

* fixed hit cli

Author: sdhoyt

imap_processing/cli.py

@@ -791,25 +791,23 @@ def do_processing(
 
         dependency_list = dependencies.processing_input
         if self.data_level == "l1a":
-            if len(dependency_list) > 1:
+            # 1 science files and 2 spice files
+            if len(dependency_list) > 3:
                 raise ValueError(
                     f"Unexpected dependencies found for HIT L1A:"
                     f"{dependency_list}. Expected only one dependency."
                 )
             # process data to L1A products
-            science_files = dependencies.get_file_paths(source="hit")
+            science_files = dependencies.get_file_paths(source="hit", descriptor="raw")
             datasets = hit_l1a(science_files[0])
 
         elif self.data_level == "l1b":
-            if len(dependency_list) > 1:
-                raise ValueError(
-                    f"Unexpected dependencies found for HIT L1B:"
-                    f"{dependency_list}. Expected only one dependency."
-                )
             data_dict = {}
-            # TODO: Check this and update with new features as needed.
+            # TODO: Sean removed the file number error handling to work with the
+            #  new SPICE dependencies for SIT-4. Need to review and make changes
+            #  if needed.
             l0_files = dependencies.get_file_paths(source="hit", descriptor="raw")
-            l1a_files = dependencies.get_file_paths(source="hit")
+            l1a_files = dependencies.get_file_paths(source="hit", data_type="l1a")
             if len(l0_files) > 0:
                 # Add path to CCSDS file to process housekeeping
                 data_dict["imap_hit_l0_raw"] = l0_files[0]
@@ -948,21 +946,21 @@ def do_processing(
         """
         print(f"Processing IMAP-Lo {self.data_level}")
         datasets: list[xr.Dataset] = []
-        dependency_list = dependencies.processing_input
         if self.data_level == "l1a":
             # L1A packet / products are 1 to 1. Should only have
             # one dependency file
-            if len(dependency_list) > 1:
+            science_files = dependencies.get_file_paths(source="lo", data_type="l0")
+            if len(science_files) > 1:
                 raise ValueError(
                     f"Unexpected dependencies found for IMAP-Lo L1A:"
-                    f"{dependency_list}. Expected only one dependency."
+                    f"{science_files}. Expected only one dependency."
                 )
-            science_files = dependencies.get_file_paths(source="lo")
             datasets = lo_l1a.lo_l1a(science_files[0])
 
         elif self.data_level == "l1b":
             data_dict = {}
             science_files = dependencies.get_file_paths(source="lo", data_type="l1a")
+            logger.info(f"Science files for L1B: {science_files}")
             for file in science_files:
                 dataset = load_cdf(file)
                 data_dict[dataset.attrs["Logical_source"]] = dataset

imap_processing/lo/l1b/lo_l1b.py

@@ -1,5 +1,6 @@
 """IMAP-Lo L1B Data Processing."""
 
+import logging
 from dataclasses import Field
 from pathlib import Path
 from typing import Any, Union
@@ -17,6 +18,9 @@
 from imap_processing.spice.geometry import SpiceFrame, instrument_pointing
 from imap_processing.spice.time import met_to_ttj2000ns, ttj2000ns_to_et
 
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+
 
 def lo_l1b(dependencies: dict) -> list[Path]:
     """
@@ -39,9 +43,10 @@ def lo_l1b(dependencies: dict) -> list[Path]:
     # create the attribute manager to access L1A fillval attributes
     attr_mgr_l1a = ImapCdfAttributes()
     attr_mgr_l1a.add_instrument_variable_attrs(instrument="lo", level="l1a")
-
+    logger.info(f"\n Dependencies: {list(dependencies.keys())}\n")
     # if the dependencies are used to create Annotated Direct Events
     if "imap_lo_l1a_de" in dependencies and "imap_lo_l1a_spin" in dependencies:
+        logger.info("\nProcessing IMAP-Lo L1B Direct Events...")
         logical_source = "imap_lo_l1b_de"
         # get the dependency dataset for l1b direct events
         l1a_de = dependencies["imap_lo_l1a_de"]

imap_processing/lo/l1c/lo_l1c.py

@@ -326,7 +326,7 @@ def create_datasets(
     #  and relative L1A DE time to calculate the absolute DE time,
     #  this epoch conversion will go away and the time in the DE dataclass
     #  can be used direction
-    epoch_converted_time = [met_to_ttj2000ns(1)]
+    epoch_converted_time = [1]
 
     # Create a data array for the epoch time
     # TODO: might need to update the attrs to use new YAML file