Merge pull request #130 from sot/blobs

fix in maude_decom.get_aca_packets from blobs
sot · Sep 16, 2022 · 1f80f39 · 1f80f39
2 parents 32dd2c7 + 2307528
commit 1f80f39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/chandra_aca/maude_decom.py b/chandra_aca/maude_decom.py
@@ -192,9 +192,10 @@ def _aca_image_msid_list(pea):
 
         'image_status': [f'AOIMAGE{i}' for i in range(8)],    # IMAGE STATUS FLAG
         'fiducial_flag': [f'AOACFID{i}' for i in range(8)],  # FIDUCIAL LIGHT FLAG (OBC)
-        'image_function': [f'AOACFCT{i}' for i in range(8)],  # IMAGE FUNCTION (OBC)
+        'image_function_obc': [f'AOACFCT{i}' for i in range(8)],  # IMAGE FUNCTION (OBC)
+        'image_function': [f'{msid_prefix}AIMGF{i}1' for i in range(8)],  # IMAGE FUNCTION (PEA)
         # this one exists also as FUNCTION2/3/4
-        # 'image_function_pea':
+        # 'image_function':
         #     [f'{msid_prefix}AIMGF{i}1' for i in range(8)],  # IMAGE FUNCTION1 (PEA)
 
         'saturated_pixel': [f'{msid_prefix}ASPXF{i}' for i in range(8)],  # DEFECTIVE PIXEL FLAG

diff --git a/chandra_aca/tests/test_maude_decom.py b/chandra_aca/tests/test_maude_decom.py
@@ -495,6 +495,12 @@ def test_blob_frame_consistency():
     slot_data = slot_data[slot_data['IMGNUM'] == slot]
     slot_data_2 = slot_data_2[slot_data_2['IMGNUM'] == slot]
     assert len(slot_data) == len(slot_data_2)
+    compare_tables(slot_data, slot_data_2, exclude=['COMMPROG_REPEAT'])
+
+    start, stop = 686105735.6057751, 686105740.7507753
+    slot_data = maude_decom.get_aca_packets(start, stop, blobs=False)
+    slot_data_blobs = maude_decom.get_aca_packets(start, stop, blobs=True)
+    compare_tables(slot_data, slot_data_blobs, exclude=['COMMPROG_REPEAT'])
 
 
 def test_get_aca_packets_blobs():