diff --git a/imap_processing/cdf/config/imap_ultra_l1a_variable_attrs.yaml b/imap_processing/cdf/config/imap_ultra_l1a_variable_attrs.yaml index e5b89dc46d..ddbd8ae062 100644 --- a/imap_processing/cdf/config/imap_ultra_l1a_variable_attrs.yaml +++ b/imap_processing/cdf/config/imap_ultra_l1a_variable_attrs.yaml @@ -1564,7 +1564,6 @@ diagnosticmode: DEPEND_0: epoch dumpdata: - <<: *default_float32 CATDESC: Dumpdata FIELDNAM: dumpdata LABLAXIS: dumpdata @@ -2787,7 +2786,6 @@ macroblocks: DEPEND_0: epoch macrodata: - <<: *default_float32 CATDESC: Macrodata FIELDNAM: macrodata LABLAXIS: macrodata diff --git a/imap_processing/tests/ultra/unit/test_ultra_l1a.py b/imap_processing/tests/ultra/unit/test_ultra_l1a.py index 5f82936148..d38096830a 100644 --- a/imap_processing/tests/ultra/unit/test_ultra_l1a.py +++ b/imap_processing/tests/ultra/unit/test_ultra_l1a.py @@ -117,6 +117,34 @@ def test_cdf_energy_rates(ccsds_path_functional): ) +def test_cdf_macrodump(ccsds_path_functional): + """Tests that CDF file can be created.""" + test_data = ultra_l1a(ccsds_path_functional, apid_input=871) + test_data[0].attrs["Data_version"] = "999" + test_data[0].attrs["Repointing"] = "repoint99999" + test_data_path = write_cdf(test_data[0], istp=True) + + assert test_data_path.exists() + assert ( + test_data_path.name + == "imap_ultra_l1a_45sensor-macrodump_20240122-repoint99999_v999.cdf" + ) + + +def test_cdf_memdump(ccsds_path_functional): + """Tests that CDF file can be created.""" + test_data = ultra_l1a(ccsds_path_functional, apid_input=868) + test_data[0].attrs["Data_version"] = "999" + test_data[0].attrs["Repointing"] = "repoint99999" + test_data_path = write_cdf(test_data[0], istp=True) + + assert test_data_path.exists() + assert ( + test_data_path.name + == "imap_ultra_l1a_45sensor-memdump_20240122-repoint99999_v999.cdf" + ) + + def test_cdf_tof(ccsds_path_theta_0): """Tests that CDF file can be created.""" test_data = ultra_l1a(ccsds_path_theta_0, apid_input=ULTRA_TOF.apid[0]) diff --git a/imap_processing/ultra/l0/ultra_utils.py b/imap_processing/ultra/l0/ultra_utils.py index e6572c2da8..e22b0b3205 100644 --- a/imap_processing/ultra/l0/ultra_utils.py +++ b/imap_processing/ultra/l0/ultra_utils.py @@ -149,16 +149,20 @@ class PacketProperties(NamedTuple): apid=[ 866, 867, + 868, 869, 870, + 871, 873, 874, 876, 877, 930, 931, + 932, 933, 934, + 935, 937, 938, 940, @@ -167,16 +171,20 @@ class PacketProperties(NamedTuple): logical_source=[ "imap_ultra_l1a_45sensor-alarm", "imap_ultra_l1a_45sensor-memchecksum", + "imap_ultra_l1a_45sensor-memdump", "imap_ultra_l1a_45sensor-status", "imap_ultra_l1a_45sensor-bootstatus", + "imap_ultra_l1a_45sensor-macrodump", "imap_ultra_l1a_45sensor-monitorlimits", "imap_ultra_l1a_45sensor-params", "imap_ultra_l1a_45sensor-scauto", "imap_ultra_l1a_45sensor-imgparams", "imap_ultra_l1a_90sensor-alarm", "imap_ultra_l1a_90sensor-memchecksum", + "imap_ultra_l1a_90sensor-memdump", "imap_ultra_l1a_90sensor-status", "imap_ultra_l1a_90sensor-bootstatus", + "imap_ultra_l1a_90sensor-macrodump", "imap_ultra_l1a_90sensor-monitorlimits", "imap_ultra_l1a_90sensor-params", "imap_ultra_l1a_90sensor-scauto",