dkist-processing-cryonirsp 1.4.14__tar.gz → 1.4.15__tar.gz

{dkist_processing_cryonirsp-1.4.14 → dkist_processing_cryonirsp-1.4.15}/CHANGELOG.rst

@@ -1,3 +1,12 @@
+v1.4.15 (2025-01-30)
+====================
+
+Bugfixes
+--------
+
+- Correct how gain files are read in the PickyBuds during parsing of CRYO-NIRSP CI linearized data. (`#172 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/172>`__)
+
+
 v1.4.14 (2025-01-29)
 ====================
 

{dkist_processing_cryonirsp-1.4.14 → dkist_processing_cryonirsp-1.4.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dkist-processing-cryonirsp
-Version: 1.4.14
+Version: 1.4.15
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

{dkist_processing_cryonirsp-1.4.14 → dkist_processing_cryonirsp-1.4.15}/dkist_processing_cryonirsp/parsers/exposure_conditions.py

@@ -71,7 +71,8 @@ class CryonirspConditionalTaskExposureConditionsBudBase(Stem):
         -------
         The exposure time associated with this fits object
         """
-        if fits_obj.ip_task_type.upper() not in self.task_types_to_ignore:
+        task_type = parse_header_ip_task_with_gains(fits_obj=fits_obj)
+        if task_type.upper() not in self.task_types_to_ignore:
             return getattr(fits_obj, self.metadata_key)
         return SpilledDirt
 
@@ -146,11 +147,12 @@ class CryonirspPickyDarkExposureConditionsBudBase(Stem):
         -------
         A tuple of a boolean indicating if the task is a dark task, and the exposure conditions for this fits object
         """
-        if fits_obj.ip_task_type.upper() == TaskName.dark.value:
+        task_type = parse_header_ip_task_with_gains(fits_obj=fits_obj)
+        if task_type.upper() == TaskName.dark.value:
             return self.DarkTaskTestAndExposureConditions(
                 is_dark=True, exposure_conditions=getattr(fits_obj, self.metadata_key)
             )
-        if fits_obj.ip_task_type.upper() not in self.task_types_to_ignore:
+        if task_type.upper() not in self.task_types_to_ignore:
             return self.DarkTaskTestAndExposureConditions(
                 is_dark=False, exposure_conditions=getattr(fits_obj, self.metadata_key)
             )

{dkist_processing_cryonirsp-1.4.14 → dkist_processing_cryonirsp-1.4.15}/dkist_processing_cryonirsp/tests/test_parse.py

@@ -1504,3 +1504,44 @@ def test_missing_lamp_gain_frames(parse_linearized_task, arm_id):
 
     with pytest.raises(ValueError, match="lamp_gain frames not found."):
         task()
+
+
+@pytest.mark.parametrize("arm_id", ["CI"])
+def test_wrong_exposure_time_lamp_gain_dark(parse_linearized_task, arm_id):
+    """
+    Given: lamp gain frames with a different exposure time than the dark frames
+    When: parsing data where the lamp gain has no matching exposure time
+    Then: everything is fine because CRYO-CI ignores lamp gains
+    """
+    task = parse_linearized_task
+    lin_tag = [CryonirspTag.linearized()]
+    solar_gain_exposure_condition = ExposureConditions(
+        10.0, AllowableOpticalDensityFilterNames.OPEN.value
+    )
+    write_solar_gain_frames_to_task(
+        task,
+        tags=lin_tag,
+        exposure_condition=solar_gain_exposure_condition,
+        num_modstates=1,
+    )
+    lamp_gain_exposure_condition = ExposureConditions(
+        1000.0, AllowableOpticalDensityFilterNames.OPEN.value
+    )
+    write_lamp_gain_frames_to_task(
+        task,
+        tags=lin_tag,
+        exposure_condition=lamp_gain_exposure_condition,
+        num_modstates=1,
+    )
+    dark_exp_condition = ExposureConditions(10.0, AllowableOpticalDensityFilterNames.OPEN.value)
+    write_dark_frames_to_task(task, exposure_condition=dark_exp_condition, tags=lin_tag)
+
+    task()
+
+    assert task.constants._db_dict["DARK_FRAME_EXPOSURE_CONDITIONS_LIST"] == [[10.0, "OPEN"]]
+    assert task.constants._db_dict["SOLAR_GAIN_EXPOSURE_CONDITIONS_LIST"] == [[10.0, "OPEN"]]
+    assert task.constants._db_dict[
+        "CI_NON_DARK_AND_NON_POLCAL_AND_NON_LAMP_GAIN_TASK_EXPOSURE_CONDITIONS_LIST"
+    ] == [[10.0, "OPEN"]]
+    with pytest.raises(KeyError):
+        assert task.constants._db_dict["LAMP_GAIN_EXPOSURE_CONDITIONS_LIST"]

{dkist_processing_cryonirsp-1.4.14 → dkist_processing_cryonirsp-1.4.15}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dkist-processing-cryonirsp
-Version: 1.4.14
+Version: 1.4.15
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause