imap-processing 0.12.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

imap_processing/swe/l2/swe_l2.py

@@ -12,35 +12,9 @@ from imap_processing.cdf.imap_cdf_manager import ImapCdfAttributes
 from imap_processing.spice.geometry import SpiceFrame
 from imap_processing.spice.spin import get_instrument_spin_phase, get_spin_angle
 from imap_processing.swe.utils import swe_constants
-from imap_processing.swe.utils.swe_utils import (
-    read_lookup_table,
-)
 
 
-def get_particle_energy() -> npt.NDArray:
-    """
-    Get particle energy.
-
-    Calculate particle energy and add to the lookup table.
-    To convert Volts to Energy, multiply ESA voltage in Volts by
-    energy conversion factor to get electron energy in eV.
-
-    Returns
-    -------
-    lookup_table : pandas.DataFrame
-        Lookup table with energy column added.
-    """
-    # The lookup table gives voltage applied to analyzers.
-    lookup_table = read_lookup_table()
-
-    # Convert voltage to electron energy in eV by apply conversion factor.
-    lookup_table["energy"] = (
-        lookup_table["esa_v"].values * swe_constants.ENERGY_CONVERSION_FACTOR
-    )
-    return lookup_table
-
-
-def calculate_phase_space_density(l1b_dataset: xr.Dataset) -> xr.Dataset:
+def calculate_phase_space_density(l1b_dataset: xr.Dataset) -> npt.NDArray:
     """
     Convert counts to phase space density.
 
@@ -52,7 +26,7 @@ def calculate_phase_space_density(l1b_dataset: xr.Dataset) -> xr.Dataset:
     Where:
         C / tau = corrected count rate which in the input L1B science data.
         G = geometric factor, in (cm^2 * ster). 7 CEMs geometric factor value.
-        eV = eV in electron-volts, calculated by get_particle_energy().
+        eV = eV in electron-volts.
         E = Energy in Joules. eV * 1.60219e-19(J/eV).
         m = mass of electron (9.10938356e-31 kg).
         s = second.
@@ -80,25 +54,12 @@ def calculate_phase_space_density(l1b_dataset: xr.Dataset) -> xr.Dataset:
 
     Returns
     -------
-    phase_space_density_dataset : xarray.Dataset
+    phase_space_density : np.ndarray
         Phase space density. We need to call this phase space density because
         there will be density in L3 processing.
     """
-    # Get esa_table_num for each full sweep.
-    esa_table_nums = l1b_dataset["esa_table_num"].values[:, 0]
-    # Get energy values from lookup table.
-    particle_energy = get_particle_energy()
-    # Get 720 (24 energy steps x 30 angle) particle energy for each full
-    # sweep data.
-    particle_energy_data = np.array(
-        [
-            particle_energy[particle_energy["table_index"] == val]["energy"].tolist()
-            for val in esa_table_nums
-        ]
-    )
-    particle_energy_data = particle_energy_data.reshape(
-        -1, swe_constants.N_ESA_STEPS, swe_constants.N_ANGLE_SECTORS
-    )
+    # Get energy values.
+    particle_energy_data = l1b_dataset["esa_energy"].values
 
     # Calculate phase space density using formula:
     #   2 * (C/tau) / (G * 1.237e31 * eV^2)
@@ -108,27 +69,14 @@ def calculate_phase_space_density(l1b_dataset: xr.Dataset) -> xr.Dataset:
         * swe_constants.VELOCITY_CONVERSION_FACTOR
         * particle_energy_data[:, :, :, np.newaxis] ** 2
     )
+    phase_space_density = density.data
 
-    # Return density as xr.dataset with phase space density and
-    # energy in eV value that flux calculation can use.
-    phase_space_density_dataset = xr.Dataset(
-        {
-            "phase_space_density": (
-                ["epoch", "esa_step", "spin_sector", "cem_id"],
-                density.data,
-            ),
-            "energy_in_eV": (
-                ["epoch", "esa_step", "spin_sector"],
-                particle_energy_data,
-            ),
-        },
-        coords=l1b_dataset.coords,
-    )
+    return phase_space_density
 
-    return phase_space_density_dataset
 
-
-def calculate_flux(l1b_dataset: xr.Dataset) -> npt.NDArray:
+def calculate_flux(
+    phase_space_density: np.ndarray, esa_energy: np.ndarray
+) -> npt.NDArray:
     """
     Calculate flux.
 
@@ -140,7 +88,7 @@ def calculate_flux(l1b_dataset: xr.Dataset) -> npt.NDArray:
     Where:
         fv = the phase space density of solar wind electrons
             given by calculate_phase_space_density() result.
-        eV = Energy in electron-volts, calculated by get_particle_energy().
+        eV = Energy in electron-volts.
         E  = Energy in Joules. eV * 1.60219e-19(J/eV).
         v  = sqrt( (3.20438 * 10e-15 / 9.10938e-31) * eV ) cm/s. See
             calculate_phase_space_density() for this calculation.
@@ -165,19 +113,20 @@ def calculate_flux(l1b_dataset: xr.Dataset) -> npt.NDArray:
 
     Parameters
     ----------
-    l1b_dataset : xarray.Dataset
-        The L1B dataset to process.
+    phase_space_density : numpy.ndarray
+        The phase space density.
+    esa_energy : numpy.ndarray
+        The energy values in eV.
 
     Returns
     -------
     flux : numpy.ndarray
         Flux values.
     """
-    phase_space_density_ds = calculate_phase_space_density(l1b_dataset)
     flux = (
         swe_constants.FLUX_CONVERSION_FACTOR
-        * phase_space_density_ds["energy_in_eV"].data[:, :, :, np.newaxis]
-        * phase_space_density_ds["phase_space_density"].data
+        * esa_energy[:, :, :, np.newaxis]
+        * phase_space_density
     )
     return flux
 
@@ -303,7 +252,7 @@ def find_angle_bin_indices(
     return spin_angle_bins_indices
 
 
-def swe_l2(l1b_dataset: xr.Dataset, data_version: str) -> xr.Dataset:
+def swe_l2(l1b_dataset: xr.Dataset) -> xr.Dataset:
     """
     Will process data to L2.
 
@@ -311,8 +260,6 @@ def swe_l2(l1b_dataset: xr.Dataset, data_version: str) -> xr.Dataset:
     ----------
     l1b_dataset : xarray.Dataset
         The L1B dataset to process.
-    data_version : str
-        Version of the data product being created.
 
     Returns
     -------
@@ -322,7 +269,6 @@ def swe_l2(l1b_dataset: xr.Dataset, data_version: str) -> xr.Dataset:
     cdf_attributes = ImapCdfAttributes()
     cdf_attributes.add_instrument_global_attrs("swe")
     cdf_attributes.add_instrument_variable_attrs("swe", "l2")
-    cdf_attributes.add_global_attribute("Data_version", data_version)
 
     # Energy values in eV.
     energy_xr = xr.DataArray(
@@ -397,9 +343,7 @@ def swe_l2(l1b_dataset: xr.Dataset, data_version: str) -> xr.Dataset:
     # Calculate phase space density and flux. Store data in shape
     # (epoch, esa_step, spin_sector, cem_id). This is for L3 purposes.
     ############################################################
-    phase_space_density = calculate_phase_space_density(l1b_dataset)[
-        "phase_space_density"
-    ]
+    phase_space_density = calculate_phase_space_density(l1b_dataset)
     dataset["phase_space_density_spin_sector"] = xr.DataArray(
         phase_space_density,
         name="phase_space_density_spin_sector",
@@ -407,7 +351,7 @@ def swe_l2(l1b_dataset: xr.Dataset, data_version: str) -> xr.Dataset:
         attrs=cdf_attributes.get_variable_attributes("phase_space_density_spin_sector"),
     )
 
-    flux = calculate_flux(l1b_dataset)
+    flux = calculate_flux(phase_space_density, l1b_dataset["esa_energy"].data)
     dataset["flux_spin_sector"] = xr.DataArray(
         flux,
         name="flux_spin_sector",
@@ -466,7 +410,7 @@ def swe_l2(l1b_dataset: xr.Dataset, data_version: str) -> xr.Dataset:
 
     # Put phase space density data in its spin angle bins using the indices.
     phase_space_density_binned_data = put_data_into_angle_bins(
-        phase_space_density.data, spin_angle_bins_indices
+        phase_space_density, spin_angle_bins_indices
     )
     dataset["phase_space_density"] = xr.DataArray(
         phase_space_density_binned_data,

imap_processing/swe/utils/swe_constants.py

@@ -7,6 +7,7 @@ N_ANGLE_SECTORS = 30
 N_CEMS = 7
 N_QUARTER_CYCLES = 4
 N_ANGLE_BINS = 30
+N_QUARTER_CYCLE_STEPS = 180
 
 MICROSECONDS_IN_SECOND = 1e6
 

imap_processing/tests/ccsds/test_excel_to_xtce.py

@@ -12,7 +12,7 @@ from imap_processing.ccsds import excel_to_xtce
 pytest.importorskip("openpyxl")
 
 
-@pytest.fixture()
+@pytest.fixture
 def xtce_excel_file(tmp_path):
     """Create an excel file for testing.
 

imap_processing/tests/cdf/test_utils.py

@@ -1,7 +1,5 @@
 """Tests for the ``cdf.utils`` module."""
 
-from pathlib import Path
-
 import imap_data_access
 import numpy as np
 import pytest
@@ -16,7 +14,7 @@ from imap_processing.cdf.utils import (
 from imap_processing.spice.time import met_to_ttj2000ns
 
 
-@pytest.fixture()
+@pytest.fixture
 def test_dataset():
     """Create a simple ``xarray`` dataset to be used in testing
 
@@ -28,7 +26,7 @@ def test_dataset():
     # Load the CDF attrs
     swe_attrs = ImapCdfAttributes()
     swe_attrs.add_instrument_global_attrs("swe")
-    swe_attrs.add_global_attribute("Data_version", "001")
+    swe_attrs.add_global_attribute("Data_version", "v001")
 
     dataset = xr.Dataset(
         {
@@ -97,17 +95,17 @@ def test_written_and_loaded_dataset(test_dataset):
     assert str(test_dataset) == str(new_dataset)
 
 
-def test_parents_injection(test_dataset):
-    """Tests the ``write_cdf`` function for Parents attribute injection.
+def test_repoint_start_date(test_dataset):
+    output_file_path = write_cdf(test_dataset)
+    assert "imap_swe_l1a_sci_20100101_v001.cdf" in output_file_path.name
+    test_dataset.attrs["Start_date"] = "20001212"
 
-    Parameters
-    ----------
-    test_dataset : xarray.Dataset
-        An ``xarray`` dataset object to test with
-    """
-    parent_paths = [Path("test_parent1.cdf"), Path("/abc/test_parent2.cdf")]
-    new_dataset = load_cdf(write_cdf(test_dataset, parent_files=parent_paths))
-    assert new_dataset.attrs["Parents"] == [p.name for p in parent_paths]
+    output_file_path = write_cdf(test_dataset)
+    assert "imap_swe_l1a_sci_20001212_v001.cdf" in output_file_path.name
+
+    test_dataset.attrs["Repointing"] = "12345"
+    output_file_path = write_cdf(test_dataset)
+    assert "imap_swe_l1a_sci_20001212-repoint12345_v001.cdf" in output_file_path.name
 
 
 @pytest.mark.parametrize(
@@ -131,7 +129,7 @@ def test_parents_injection(test_dataset):
                 "data_level": "l1a",
                 "descriptor": "hist",
                 "start_date": "20250415",
-                "version": "001",
+                "version": "v001",
             },
         ),
         (
@@ -144,7 +142,7 @@ def test_parents_injection(test_dataset):
                 "descriptor": "pset",
                 "start_date": "20250415",
                 "repointing": "12345",
-                "version": "001",
+                "version": "v001",
                 "extension": "cdf",
             },
         ),

imap_processing/tests/codice/conftest.py

@@ -1,43 +1,54 @@
 from imap_processing import imap_module_directory
 
-TEST_DATA_PATH = imap_module_directory / "tests" / "codice" / "data"
+TEST_L0_DATA_PATH = imap_module_directory / "tests" / "codice" / "data"
+TEST_L0_FILE = TEST_L0_DATA_PATH / "imap_codice_l0_raw_20241110_v001.pkts"
+TEST_L1A_DATA_PATH = (
+    imap_module_directory
+    / "codice"
+    / "data"
+    / "imap"
+    / "codice"
+    / "l1a"
+    / "2024"
+    / "11"
+)
 
-TEST_L0_FILE = TEST_DATA_PATH / "imap_codice_l0_raw_20241110_v001.pkts"
 
 TEST_L1A_FILES = [
-    TEST_DATA_PATH / "imap_codice_l1a_hskp_20100101_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_hi-counters-aggregated_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_hi-counters-singles_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_hi-omni_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_hi-sectored_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-counters-aggregated_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-counters-singles_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-sw-angular_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-nsw-angular_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-sw-priority_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-nsw-priority_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-sw-species_20240429_v001.pkts",
-    TEST_DATA_PATH / "imap_codice_l1a_lo-nsw-species_20240429_v001.pkts",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_hskp_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_hi-counters-aggregated_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_hi-counters-singles_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_hi-omni_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_hi-priority_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_hi-sectored_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-counters-aggregated_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-counters-singles_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-sw-angular_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-nsw-angular_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-sw-priority_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-nsw-priority_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-sw-species_20241110_v001.cdf",
+    TEST_L1A_DATA_PATH / "imap_codice_l1a_lo-nsw-species_20241110_v001.cdf",
 ]
 
 # ruff: noqa
 VALIDATION_DATA = [
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-ialirt_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-ialirt_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hskp_20241110193622_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-counters-aggregated_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-counters-singles_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-sw-priority_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-nsw-priority_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-sw-species_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-nsw-species_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-sw-angular_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-nsw-angular_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-counters-aggregated_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-counters-singles_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-omni_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-sectored_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-priorities_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_lo-pha_20241110193700_v0.0.0.cdf",
-    TEST_DATA_PATH / "validation" / "imap_codice_l1a_hi-pha_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-ialirt_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-ialirt_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hskp_20241110193622_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-counters-aggregated_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-counters-singles_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-sw-priority_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-nsw-priority_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-sw-species_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-nsw-species_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-sw-angular_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-nsw-angular_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-counters-aggregated_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-counters-singles_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-omni_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-sectored_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-priorities_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_lo-pha_20241110193700_v0.0.0.cdf",
+    TEST_L0_DATA_PATH / "validation" / "imap_codice_l1a_hi-pha_20241110193700_v0.0.0.cdf",
 ]  # fmt: skip

imap_processing/tests/codice/test_codice_l1a.py

@@ -1,6 +1,7 @@
 """Tests the L1a processing for decommutated CoDICE data"""
 
 import logging
+import re
 
 import numpy as np
 import pytest
@@ -9,6 +10,7 @@ import xarray as xr
 from imap_processing.cdf.utils import load_cdf, write_cdf
 from imap_processing.codice import constants
 from imap_processing.codice.codice_l1a import process_codice_l1a
+from imap_processing.tests.conftest import _download_external_data, _test_data_paths
 
 from .conftest import TEST_L0_FILE, VALIDATION_DATA
 
@@ -55,7 +57,7 @@ EXPECTED_ARRAY_SHAPES = [
     (77, 15, 4),  # hi-omni
     (77, 8, 12, 12),  # hi-sectored
     (77,),  # hi-priority
-    (),  # lo-pha  # TODO: Need to implement
+    (77, 10000),  # lo-pha
     (),  # hi-pha  # TODO: Need to implement
 ]
 
@@ -76,7 +78,7 @@ EXPECTED_NUM_VARIABLES = [
     10,  # hi-omni
     6,  # hi-sectored
     8,  # hi-priority
-    0,  # lo-pha  # TODO: Need to implement
+    80,  # lo-pha
     0,  # hi-pha  # TODO: Need to implement
 ]
 
@@ -112,8 +114,11 @@ def test_l1a_data() -> xr.Dataset:
     processed_datasets : list[xarray.Dataset]
         A list of ``xarray`` datasets containing the test data
     """
-
-    processed_datasets = process_codice_l1a(file_path=TEST_L0_FILE, data_version="001")
+    # Make sure we have the data available here. This test collection gets
+    # skipped at the module level if the mark isn't present. We can't decorate
+    # a fixture, so add the needed call directly here instead.
+    _download_external_data(_test_data_paths())
+    processed_datasets = process_codice_l1a(file_path=TEST_L0_FILE)
 
     return processed_datasets
 
@@ -135,9 +140,10 @@ def test_l1a_data_array_shape(test_l1a_data, index):
 
     # Mark currently broken/unsupported datasets as expected to fail
     # TODO: Remove these once they are supported
-    if index in [0, 1, 16, 17]:
+    if index in [0, 1, 17]:
         pytest.xfail("Data product is currently unsupported")
 
+    # There are exceptions for some variables
     for variable in processed_dataset:
         # For variables with energy dimensions
         if variable in ["energy_table", "acquisition_time_per_step"]:
@@ -154,7 +160,10 @@ def test_l1a_data_array_shape(test_l1a_data, index):
             assert processed_dataset[variable].data.shape == (
                 len(processed_dataset["epoch"].data),
             )
-        # For counter variables
+        # For some direct event variables:
+        elif re.match(r"P[0-7]_(NumEvents|DataQuality)", variable):
+            assert processed_dataset[variable].data.shape == (77,)
+        # For nominal variables
         else:
             assert processed_dataset[variable].data.shape == expected_shape
 
@@ -179,7 +188,7 @@ def test_l1a_logical_sources(test_l1a_data, index):
 
     # Mark currently broken/unsupported datasets as expected to fail
     # TODO: Remove these once they are supported
-    if index in [0, 1, 16, 17]:
+    if index in [0, 1, 17]:
         pytest.xfail("Data product is currently unsupported")
 
     # Write the dataset to a file to set the logical source attribute
@@ -207,7 +216,7 @@ def test_l1a_num_data_variables(test_l1a_data, index):
 
     # Mark currently broken/unsupported datasets as expected to fail
     # TODO: Remove these once they are supported
-    if index in [0, 1, 16, 17]:
+    if index in [0, 1, 17]:
         pytest.xfail("Data product is currently unsupported")
 
     assert len(processed_dataset) == EXPECTED_NUM_VARIABLES[index]
@@ -245,12 +254,12 @@ def test_l1a_validate_data_arrays(test_l1a_data: xr.Dataset, index):
         "lo-nsw-priority",
         "lo-sw-species",
         "lo-nsw-species",
-        "hi-sectored",
+        "lo_pha",
     ]
 
     if descriptor in able_to_be_validated:
         counters = getattr(
-            constants, f'{descriptor.upper().replace("-","_")}_VARIABLE_NAMES'
+            constants, f"{descriptor.upper().replace('-', '_')}_VARIABLE_NAMES"
         )
         processed_dataset = test_l1a_data[index]
         validation_dataset = load_cdf(VALIDATION_DATA[index])
@@ -356,7 +365,7 @@ def test_l1a_validate_support_variables(test_l1a_data, index):
 def test_l1a_multiple_packets():
     """Tests that an input L0 file containing multiple APIDs can be processed."""
 
-    processed_datasets = process_codice_l1a(file_path=TEST_L0_FILE, data_version="001")
+    processed_datasets = process_codice_l1a(file_path=TEST_L0_FILE)
 
     # TODO: Could add some more checks here?
     assert len(processed_datasets) == 18

imap_processing/tests/codice/test_codice_l1b.py

@@ -3,16 +3,16 @@
 import pytest
 import xarray as xr
 
-from imap_processing.cdf.utils import load_cdf
 from imap_processing.codice.codice_l1b import process_codice_l1b
 
 from .conftest import TEST_L1A_FILES
 
-EXPECTED_LOGICAL_SOURCE = [
+EXPECTED_LOGICAL_SOURCES = [
     "imap_codice_l1b_hskp",
     "imap_codice_l1b_hi-counters-aggregated",
     "imap_codice_l1b_hi-counters-singles",
     "imap_codice_l1b_hi-omni",
+    "imap_codice_l1b_hi-priority",
     "imap_codice_l1b_hi-sectored",
     "imap_codice_l1b_lo-counters-aggregated",
     "imap_codice_l1b_lo-counters-singles",
@@ -34,18 +34,17 @@ def test_l1b_data(request) -> xr.Dataset:
     dataset : xr.Dataset
         A ``xarray`` dataset containing the test data
     """
-    input_dataset = load_cdf(request.param)
-    dataset = process_codice_l1b(input_dataset, data_version="001")
+    dataset = process_codice_l1b(request.param)
     return dataset
 
 
 @pytest.mark.skip("Awaiting proper implementation of L1B")
 @pytest.mark.parametrize(
     "test_l1b_data, expected_logical_source",
-    list(zip(TEST_L1A_FILES, EXPECTED_LOGICAL_SOURCE)),
+    list(zip(TEST_L1A_FILES, EXPECTED_LOGICAL_SOURCES)),
     indirect=["test_l1b_data"],
 )
-def test_l1b_cdf_filenames(test_l1b_data: xr.Dataset, expected_logical_source: str):
+def test_l1b_logical_sources(test_l1b_data: xr.Dataset, expected_logical_source: str):
     """Tests that the ``process_codice_l1b`` function generates datasets
     with the expected logical source.
 
@@ -53,7 +52,7 @@ def test_l1b_cdf_filenames(test_l1b_data: xr.Dataset, expected_logical_source: s
     ----------
     test_l1b_data : xr.Dataset
         A ``xarray`` dataset containing the test data
-    expected_filename : str
+    expected_logical_source : str
         The expected CDF filename
     """