From 08ff0b3cf04019c60a50d4e23a0d690bccd4ffd4 Mon Sep 17 00:00:00 2001 From: Laura Sandoval Date: Tue, 1 Jul 2025 09:18:57 -0600 Subject: [PATCH] update to packet defintions --- imap_processing/tests/external_test_data_config.py | 2 +- imap_processing/tests/ultra/unit/test_decom_apid_897.py | 5 +---- imap_processing/ultra/l0/ultra_utils.py | 4 +++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/imap_processing/tests/external_test_data_config.py b/imap_processing/tests/external_test_data_config.py index 3725f6c31c..2073f5ace0 100644 --- a/imap_processing/tests/external_test_data_config.py +++ b/imap_processing/tests/external_test_data_config.py @@ -63,7 +63,7 @@ ("IMAP-Ultra45_r1_L1_V0_shortened.csv", "ultra/data/l1/"), # Ultra - ("ultra45_raw_sc_rawnrgevnt_FM45_UltraFM45_Functional_2024-01-22T0105_20240122T010548.csv", "ultra/data/l0/"), + ("ultra45_raw_sc_rawnrgevnt_19840122_00.csv", "ultra/data/l0/"), ("ultra45_raw_sc_imgpriority1evnt_FM45_UltraFM45Extra_TV_Tests_2024-01-22T0930_20240122T093008.csv", "ultra/data/l0/"), ("ultra45_raw_sc_ultranrgrates_FM45_UltraFM45_Functional_" "2024-01-22T0105_20240122T010548.csv", "ultra/data/l0/"), diff --git a/imap_processing/tests/ultra/unit/test_decom_apid_897.py b/imap_processing/tests/ultra/unit/test_decom_apid_897.py index 4391609b4e..8d4098c242 100644 --- a/imap_processing/tests/ultra/unit/test_decom_apid_897.py +++ b/imap_processing/tests/ultra/unit/test_decom_apid_897.py @@ -24,10 +24,7 @@ def test_image_raw_energy_events_decom(decom_test_data, ccsds_path_events, xtce_ """This function reads validation data and checks that decom data matches validation data for the packet""" - filename = ( - "ultra45_raw_sc_rawnrgevnt_FM45_UltraFM45_Functional_" - "2024-01-22T0105_20240122T010548.csv" - ) + filename = "ultra45_raw_sc_rawnrgevnt_19840122_00.csv" energy_events_test_path = ( imap_module_directory / "tests" / "ultra" / "data" / "l0" / filename ) diff --git a/imap_processing/ultra/l0/ultra_utils.py b/imap_processing/ultra/l0/ultra_utils.py index 310922f71d..017d579c42 100644 --- a/imap_processing/ultra/l0/ultra_utils.py +++ b/imap_processing/ultra/l0/ultra_utils.py @@ -239,7 +239,9 @@ class PacketProperties(NamedTuple): # Pulse Width "pulse_width": (16, 27), # Bin - "bin": (27, 33), + "bin": (27, 31), + # Phase Angle + "phase_angle": (31, 41), }