dkist-processing-cryonirsp 1.4.14__py3-none-any.whl → 1.4.15__py3-none-any.whl

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/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.dist-info → dkist_processing_cryonirsp-1.4.15.dist-info}/METADATA

@@ -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.dist-info → dkist_processing_cryonirsp-1.4.15.dist-info}/RECORD

@@ -11,7 +11,7 @@ dkist_processing_cryonirsp/parsers/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4Z
 dkist_processing_cryonirsp/parsers/check_for_gains.py,sha256=v-eD1LG0dlFoZXz5Y-2ZyPvRL2TZ8gWfr5cN6YNYqvo,2341
 dkist_processing_cryonirsp/parsers/cryonirsp_l0_fits_access.py,sha256=iu5GJWVQ1PZfv5TR0u_IS2j2KZBU0yewa1ugxjDfVzk,4568
 dkist_processing_cryonirsp/parsers/cryonirsp_l1_fits_access.py,sha256=sc8MzxYMc8E1eFrL5KguAGHViCMJhaDfiBtZPml4ELg,886
-dkist_processing_cryonirsp/parsers/exposure_conditions.py,sha256=6bScBlUECw6WFNCfPFSXoBCmi1UI8vZvOfjdDUFm04E,8339
+dkist_processing_cryonirsp/parsers/exposure_conditions.py,sha256=Mcud-0PQK0oJSxbqtQUtVk0t8b6YBEFSyGsGbG5UqGg,8445
 dkist_processing_cryonirsp/parsers/map_repeats.py,sha256=PjZ986bqkCdii-EOzU045cWqadxQC_nyyqwWYIpYdls,1566
 dkist_processing_cryonirsp/parsers/measurements.py,sha256=6IqqrVbXVnUxYUXnQF-WlJSEP-eSffr2Gx6Kj0bjxhc,1872
 dkist_processing_cryonirsp/parsers/modstates.py,sha256=00a4kCiwgioTpMkYY9ouFuiEsoQHcD-sJOM95qI9Fhc,1093
@@ -65,7 +65,7 @@ dkist_processing_cryonirsp/tests/test_instrument_polarization.py,sha256=GgZmPJVt
 dkist_processing_cryonirsp/tests/test_linearity_correction.py,sha256=y9gDWlHsOaTMP7K5-lIIVmboa6nd0ozaqEtl6Fvt5T0,9406
 dkist_processing_cryonirsp/tests/test_make_movie_frames.py,sha256=WznHp9dV2-jbJYzRniCAIbSHCGNc0SpSzyVDSrZkYd4,4904
 dkist_processing_cryonirsp/tests/test_parameters.py,sha256=CbaEnxx3HGZmqZJbNzQ2IJpIg6AKlK26BT3TXUMGYAE,11438
-dkist_processing_cryonirsp/tests/test_parse.py,sha256=FErtlMvrf1MhZxIvcWnLKjRtZ5ihS56wTeMuPiqH7HA,54163
+dkist_processing_cryonirsp/tests/test_parse.py,sha256=UXbAZb4EJ-jlrkSfQXGTp7SA9B-OG5UBgV2SkCQZHxg,55804
 dkist_processing_cryonirsp/tests/test_quality.py,sha256=DWuL7q8x2RtPz3LN9-KEw541sv6Law9WyVQKaamkOmE,8169
 dkist_processing_cryonirsp/tests/test_sp_beam_boundaries.py,sha256=4hONuVLQAqkQjNtpNzvmqEWLg3LI1XJLWaekkeS3SJo,4815
 dkist_processing_cryonirsp/tests/test_sp_dispersion_axis_correction.py,sha256=lhwT_I0HQuH66I0TRvARfuNnWWjxeAvQ4fEEVmbhp_E,6098
@@ -105,7 +105,7 @@ docs/requirements_table.rst,sha256=FaqSag9kPi77gWPhzeo_tFEhRFjb3qUuNqqQe1K76NM,2
 docs/scientific_changelog.rst,sha256=01AWBSHg8zElnodCgAq-hMxhk9CkX5rtEENx4iz0sjI,300
 docs/sp_science_calibration.rst,sha256=fHBOZ2cqySxLjNi737KfynlmHZy9W4EwvuzxnyjDNvk,2597
 licenses/LICENSE.rst,sha256=piZaQplkzOMmH1NXg6QIdo9wwo9pPCoHkvm2-DmH76E,1462
-dkist_processing_cryonirsp-1.4.14.dist-info/METADATA,sha256=ZOIC7J8e7aV2UqLbhLD3cS4ieguXVPnsCn0G14e2T7s,8410
-dkist_processing_cryonirsp-1.4.14.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dkist_processing_cryonirsp-1.4.14.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
-dkist_processing_cryonirsp-1.4.14.dist-info/RECORD,,
+dkist_processing_cryonirsp-1.4.15.dist-info/METADATA,sha256=nzYxsQYcgSPkitS0xUODUPTMDhXnJhGgo3mUvL9VyZE,8410
+dkist_processing_cryonirsp-1.4.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dkist_processing_cryonirsp-1.4.15.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
+dkist_processing_cryonirsp-1.4.15.dist-info/RECORD,,