dkist-processing-common 10.7.1__tar.gz → 10.7.2__tar.gz

{dkist_processing_common-10.7.1 → dkist_processing_common-10.7.2}/CHANGELOG.rst

@@ -1,3 +1,12 @@
+v10.7.2 (2025-04-21)
+====================
+
+Bugfixes
+--------
+
+- Fix a bug in which the AO_LOCK header key is assumed to exist.  The AO_LOCK header key is optional. (`#249 <https://bitbucket.org/dkistdc/dkist-processing-common/pull-requests/249>`__)
+
+
 v10.7.1 (2025-04-17)
 ====================
 

{dkist_processing_common-10.7.1 → dkist_processing_common-10.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 10.7.1
+Version: 10.7.2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

{dkist_processing_common-10.7.1 → dkist_processing_common-10.7.2}/dkist_processing_common/tasks/write_l1.py

@@ -512,6 +512,6 @@ class WriteL1Frame(WorkflowTaskBase, MetadataStoreMixin, ABC):
     @staticmethod
     def remove_invalid_r0_values(header: fits.Header) -> fits.Header:
         """Remove the Fried parameter r0 from the header if the AO is not locked."""
-        if not header["AO_LOCK"]:
+        if header.get("AO_LOCK") is not True:
             header.pop("ATMOS_R0", None)
         return header

{dkist_processing_common-10.7.1 → dkist_processing_common-10.7.2}/dkist_processing_common/tests/test_write_l1.py

@@ -157,8 +157,9 @@ def write_l1_task(request, recipe_run_id, tmp_path):
 @pytest.fixture(
     scope="function",
     params=[
-        pytest.param(True, id="AO_lock_on"),
-        pytest.param(False, id="AO_lock_off"),
+        pytest.param({"AO_LOCK": True}, id="AO_LOCK_True"),
+        pytest.param({"AO_LOCK": False}, id="AO_LOCK_False"),
+        pytest.param({}, id="AO_LOCK_missing"),
     ],
 )
 def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_header):
@@ -171,7 +172,8 @@ def write_l1_task_no_data(request, recipe_run_id, tmp_path, complete_common_head
     ):
         task.scratch = WorkflowFileSystem(recipe_run_id=recipe_run_id, scratch_base_path=tmp_path)
         header = complete_common_header
-        header["AO_LOCK"] = request.param
+        header.pop("AO_LOCK", None)  # If it's not required, shouldn't be here in the first place??
+        header.update(request.param)
         fried_parameter = 0.2
         header["ATMOS_R0"] = fried_parameter
         hdu = fits.PrimaryHDU(data=np.random.random(size=(1, 1, 1)) * 1, header=header)
@@ -604,12 +606,11 @@ def test_check_r0_ao_lock(write_l1_task_no_data):
     """
     task, header, r0 = write_l1_task_no_data
     header_after_check = task.remove_invalid_r0_values(header=header)
-    if header["AO_LOCK"]:
+    if header.get("AO_LOCK"):
         assert header_after_check["ATMOS_R0"] == header["ATMOS_R0"]
         assert header["ATMOS_R0"] == r0
         assert header["AO_LOCK"]
-    if not header["AO_LOCK"]:
-        with pytest.raises(KeyError) as ke:
+    else:
+        with pytest.raises(KeyError, match="Keyword 'ATMOS_R0' not found"):
             invalid_r0 = header_after_check["ATMOS_R0"]
-        assert "Keyword 'ATMOS_R0' not found" in str(ke)
-        assert not header["AO_LOCK"]
+        assert header.get("AO_LOCK") != True

{dkist_processing_common-10.7.1 → dkist_processing_common-10.7.2}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 10.7.1
+Version: 10.7.2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause