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

dkist_processing_cryonirsp/models/constants.py

@@ -32,10 +32,15 @@ class CryonirspBudName(Enum):
     solar_gain_exposure_conditions_list = "SOLAR_GAIN_EXPOSURE_CONDITIONS_LIST"
     polcal_exposure_conditions_list = "POLCAL_EXPOSURE_CONDITIONS_LIST"
     observe_exposure_conditions_list = "OBSERVE_EXPOSURE_CONDITIONS_LIST"
-    non_dark_and_non_polcal_task_exposure_conditions_list = (
-        "NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST"
+    sp_non_dark_and_non_polcal_task_exposure_conditions_list = (
+        "SP_NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST"
+    )
+    ci_non_dark_and_non_polcal_and_non_lamp_gain_task_exposure_conditions_list = (
+        "CI_NON_DARK_AND_NON_POLCAL_AND_NON_LAMP_GAIN_TASK_EXPOSURE_CONDITIONS_LIST"
     )
     picky_dark_exposure_conditions_list = "PICKY_DARK_EXPOSURE_CONDITIONS_LIST"
+    ci_picky_dark_exposure_conditions_list = "CI_PICKY_DARK_EXPOSURE_CONDITIONS_LIST"
+    sp_picky_dark_exposure_conditions_list = "SP_PICKY_DARK_EXPOSURE_CONDITIONS_LIST"
     modulator_spin_mode = "MODULATOR_SPIN_MODE"
     axis_1_type = "AXIS_1_TYPE"
     axis_2_type = "AXIS_2_TYPE"
@@ -47,6 +52,8 @@ class CryonirspBudName(Enum):
     optical_density_filter_picky_bud = "OPTICAL_DENSITY_FILTER_PICKY_BUD"
     solar_gain_ip_start_time = "SOLAR_GAIN_IP_START_TIME"
     gain_frame_type_list = "GAIN_FRAME_TYPE_LIST"
+    lamp_gain_frame_type_list = "LAMP_GAIN_FRAME_TYPE_LIST"
+    solar_gain_frame_type_list = "SOLAR_GAIN_FRAME_TYPE_LIST"
 
 
 class CryonirspConstants(ConstantsBase):
@@ -188,10 +195,21 @@ class CryonirspConstants(ConstantsBase):
             return []
 
     @property
-    def non_dark_and_non_polcal_task_exposure_conditions_list(self) -> [ExposureConditions]:
+    def ci_non_dark_and_non_polcal_and_non_lamp_gain_task_exposure_conditions_list(
+        self,
+    ) -> [ExposureConditions]:
+        """Return a list of all exposure times required for all tasks other than dark, polcal, and lamp gain."""
+        raw_conditions: list[list[int, str]] = self._db_dict[
+            CryonirspBudName.ci_non_dark_and_non_polcal_and_non_lamp_gain_task_exposure_conditions_list.value
+        ]
+        conditions = [ExposureConditions(*item) for item in raw_conditions]
+        return conditions
+
+    @property
+    def sp_non_dark_and_non_polcal_task_exposure_conditions_list(self) -> [ExposureConditions]:
         """Return a list of all exposure times required for all tasks other than dark and polcal."""
         raw_conditions: list[list[int, str]] = self._db_dict[
-            CryonirspBudName.non_dark_and_non_polcal_task_exposure_conditions_list.value
+            CryonirspBudName.sp_non_dark_and_non_polcal_task_exposure_conditions_list.value
         ]
         conditions = [ExposureConditions(*item) for item in raw_conditions]
         return conditions

dkist_processing_cryonirsp/parsers/check_for_gains.py

@@ -12,11 +12,12 @@ from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 
 
-class CheckGainFramesPickyBud(Stem):
-    """Pickybud to check for lamp gain and solar gain frames."""
+class CheckGainFramesPickyBudBase(Stem):
+    """Pickybud to check for gain frames."""
 
-    def __init__(self):
-        super().__init__(stem_name=CryonirspBudName.gain_frame_type_list.value)
+    def __init__(self, stem_name: str, task_name: str):
+        super().__init__(stem_name=stem_name)
+        self.task_name = task_name.casefold()
 
     def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | str:
         """
@@ -30,15 +31,11 @@ class CheckGainFramesPickyBud(Stem):
         -------
         The calibration frame object associated with this fits object
         """
-        task = parse_header_ip_task_with_gains(fits_obj).casefold()
-
-        if task in [TaskName.lamp_gain.value.casefold(), TaskName.solar_gain.value.casefold()]:
-            return task
-        return SpilledDirt
+        return parse_header_ip_task_with_gains(fits_obj).casefold()
 
-    def getter(self, key: Hashable) -> Thorn:
+    def getter(self, key: Hashable) -> Type[Thorn]:
         """
-        Check that lamp and solar gain frames exist. If they do, return a Thorn.
+        Check that the specific gain exists. If it does, return a Thorn.
 
         Parameters
         ----------
@@ -49,10 +46,28 @@ class CheckGainFramesPickyBud(Stem):
         -------
         Thorn
         """
-        gain_task_types = list(self.key_to_petal_dict.values())
+        task_types = list(self.key_to_petal_dict.values())
 
-        if TaskName.lamp_gain.value.casefold() not in gain_task_types:
-            raise ValueError("Lamp gain frames not found.")
-        if TaskName.solar_gain.value.casefold() not in gain_task_types:
-            raise ValueError("Solar gain frames not found.")
+        if self.task_name not in task_types:
+            raise ValueError(f"{self.task_name} frames not found.")
         return Thorn
+
+
+class CheckSolarGainFramesPickyBud(CheckGainFramesPickyBudBase):
+    """Pickybud to check for solar gain frames."""
+
+    def __init__(self):
+        super().__init__(
+            stem_name=CryonirspBudName.solar_gain_frame_type_list.value,
+            task_name=TaskName.solar_gain.value,
+        )
+
+
+class CheckLampGainFramesPickyBud(CheckGainFramesPickyBudBase):
+    """Pickybud to check for lamp gain frames."""
+
+    def __init__(self):
+        super().__init__(
+            stem_name=CryonirspBudName.lamp_gain_frame_type_list.value,
+            task_name=TaskName.lamp_gain.value,
+        )

dkist_processing_cryonirsp/parsers/exposure_conditions.py

@@ -13,8 +13,6 @@ from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 
-_DARK_AND_POLCAL_TASK_TYPES = (TaskName.dark.value, TaskName.polcal.value)
-
 
 class CryonirspTaskExposureConditionsBud(Stem):
     """
@@ -53,14 +51,13 @@ class CryonirspTaskExposureConditionsBud(Stem):
         return exposure_conditions_tuple
 
 
-class CryonirspNonDarkAndNonPolcalTaskExposureConditionsBud(Stem):
-    """For ip task types that are neither DARK nor POLCAL, produce a list of exposure conditions tuples."""
+class CryonirspConditionalTaskExposureConditionsBudBase(Stem):
+    """For ip task types that are not in task_types_to_ignore, produce a list of exposure conditions tuples."""
 
-    def __init__(self):
-        super().__init__(
-            stem_name=CryonirspBudName.non_dark_and_non_polcal_task_exposure_conditions_list.value
-        )
+    def __init__(self, stem_name: str, task_types_to_ignore: list[str]):
+        super().__init__(stem_name=stem_name)
         self.metadata_key = "exposure_conditions"
+        self.task_types_to_ignore = task_types_to_ignore
 
     def setter(self, fits_obj: CryonirspL0FitsAccess) -> ExposureConditions | Type[SpilledDirt]:
         """
@@ -74,7 +71,8 @@ class CryonirspNonDarkAndNonPolcalTaskExposureConditionsBud(Stem):
         -------
         The exposure time associated with this fits object
         """
-        if fits_obj.ip_task_type.upper() not in _DARK_AND_POLCAL_TASK_TYPES:
+        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
 
@@ -95,16 +93,47 @@ class CryonirspNonDarkAndNonPolcalTaskExposureConditionsBud(Stem):
         return exposure_conditions_tuple
 
 
-class CryonirspPickyDarkExposureConditionsBud(Stem):
+class CryonirspSPConditionalTaskExposureConditionsBud(
+    CryonirspConditionalTaskExposureConditionsBudBase
+):
+    """For ip task types that are neither DARK nor POLCAL, produce a list of exposure conditions tuples."""
+
+    def __init__(self):
+        super().__init__(
+            stem_name=CryonirspBudName.sp_non_dark_and_non_polcal_task_exposure_conditions_list.value,
+            task_types_to_ignore=[TaskName.dark.value, TaskName.polcal.value],
+        )
+        self.metadata_key = "exposure_conditions"
+
+
+class CryonirspCIConditionalTaskExposureConditionsBud(
+    CryonirspConditionalTaskExposureConditionsBudBase
+):
+    """For ip task types that are neither DARK nor POLCAL nor LAMP GAIN, produce a list of exposure conditions tuples."""
+
+    def __init__(self):
+        super().__init__(
+            stem_name=CryonirspBudName.ci_non_dark_and_non_polcal_and_non_lamp_gain_task_exposure_conditions_list.value,
+            task_types_to_ignore=[
+                TaskName.dark.value,
+                TaskName.polcal.value,
+                TaskName.lamp_gain.value,
+            ],
+        )
+        self.metadata_key = "exposure_conditions"
+
+
+class CryonirspPickyDarkExposureConditionsBudBase(Stem):
     """Parse exposure conditions tuples to ensure existence of dark frames with the required exposure conditions."""
 
     DarkTaskTestAndExposureConditions = namedtuple(
         "DarkTaskTestAndExposureConditions", ["is_dark", "exposure_conditions"]
     )
 
-    def __init__(self):
-        super().__init__(stem_name=CryonirspBudName.picky_dark_exposure_conditions_list.value)
+    def __init__(self, stem_name: str, task_types_to_ignore: list[str]):
+        super().__init__(stem_name=stem_name)
         self.metadata_key = "exposure_conditions"
+        self.task_types_to_ignore = task_types_to_ignore
 
     def setter(self, fits_obj: CryonirspL0FitsAccess) -> tuple | Type[SpilledDirt]:
         """
@@ -118,15 +147,16 @@ class CryonirspPickyDarkExposureConditionsBud(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 _DARK_AND_POLCAL_TASK_TYPES:
+        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)
             )
-            # Polcal falls through
+            # Ignored task types fall through
         return SpilledDirt
 
     def getter(self, key: Hashable) -> Type[Thorn]:
@@ -161,3 +191,30 @@ class CryonirspPickyDarkExposureConditionsBud(Stem):
                 f"Exposure conditions required in the set of dark frames not found. Missing conditions = {other_exposure_conditions_missing_from_dark_exposure_conditions}"
             )
         return Thorn
+
+
+class CryonirspCIPickyDarkExposureConditionsBud(CryonirspPickyDarkExposureConditionsBudBase):
+    """Parse exposure conditions tuples to ensure existence of dark frames with the required exposure conditions, ignoring polcal frames and lamp gain frames."""
+
+    def __init__(self):
+        super().__init__(
+            stem_name=CryonirspBudName.ci_picky_dark_exposure_conditions_list.value,
+            task_types_to_ignore=[
+                TaskName.dark.value,
+                TaskName.polcal.value,
+                TaskName.lamp_gain.value,
+            ],
+        )
+
+
+class CryonirspSPPickyDarkExposureConditionsBud(CryonirspPickyDarkExposureConditionsBudBase):
+    """Parse exposure conditions tuples to ensure existence of dark frames with the required exposure conditions, ignoring polcal frames."""
+
+    def __init__(self):
+        super().__init__(
+            stem_name=CryonirspBudName.sp_picky_dark_exposure_conditions_list.value,
+            task_types_to_ignore=[
+                TaskName.dark.value,
+                TaskName.polcal.value,
+            ],
+        )

dkist_processing_cryonirsp/tasks/dark.py

@@ -39,9 +39,16 @@ class DarkCalibration(CryonirspTaskBase):
         None
 
         """
-        target_exposure_conditions = (
-            self.constants.non_dark_and_non_polcal_task_exposure_conditions_list
-        )
+        arm = self.constants.arm_id
+
+        if arm == "CI":
+            target_exposure_conditions = (
+                self.constants.ci_non_dark_and_non_polcal_and_non_lamp_gain_task_exposure_conditions_list
+            )
+        if arm == "SP":
+            target_exposure_conditions = (
+                self.constants.sp_non_dark_and_non_polcal_task_exposure_conditions_list
+            )
 
         logger.info(f"{target_exposure_conditions = }")
         with self.apm_task_step(

dkist_processing_cryonirsp/tasks/parse.py

@@ -25,14 +25,21 @@ from dkist_processing_cryonirsp.models.constants import CryonirspBudName
 from dkist_processing_cryonirsp.models.parameters import CryonirspParsingParameters
 from dkist_processing_cryonirsp.models.tags import CryonirspStemName
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
-from dkist_processing_cryonirsp.parsers.check_for_gains import CheckGainFramesPickyBud
+from dkist_processing_cryonirsp.parsers.check_for_gains import CheckLampGainFramesPickyBud
+from dkist_processing_cryonirsp.parsers.check_for_gains import CheckSolarGainFramesPickyBud
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspRampFitsAccess
 from dkist_processing_cryonirsp.parsers.exposure_conditions import (
-    CryonirspNonDarkAndNonPolcalTaskExposureConditionsBud,
+    CryonirspCIConditionalTaskExposureConditionsBud,
 )
 from dkist_processing_cryonirsp.parsers.exposure_conditions import (
-    CryonirspPickyDarkExposureConditionsBud,
+    CryonirspCIPickyDarkExposureConditionsBud,
+)
+from dkist_processing_cryonirsp.parsers.exposure_conditions import (
+    CryonirspSPConditionalTaskExposureConditionsBud,
+)
+from dkist_processing_cryonirsp.parsers.exposure_conditions import (
+    CryonirspSPPickyDarkExposureConditionsBud,
 )
 from dkist_processing_cryonirsp.parsers.exposure_conditions import (
     CryonirspTaskExposureConditionsBud,
@@ -180,16 +187,12 @@ class ParseL0CryonirspLinearizedData(ParseDataBase, InputDatasetMixin):
             NumberOfScanStepsBud(),
             NumberOfMeasurementsBud(),
             CryonirspSolarGainStartTimeBud(),
-            CheckGainFramesPickyBud(),
+            CheckSolarGainFramesPickyBud(),
             NumCSStepBud(self.parameters.max_cs_step_time_sec),
             CryonirspTaskExposureConditionsBud(
                 stem_name=CryonirspBudName.dark_frame_exposure_conditions_list.value,
                 ip_task_type=TaskName.dark.value,
             ),
-            CryonirspTaskExposureConditionsBud(
-                stem_name=CryonirspBudName.lamp_gain_exposure_conditions_list.value,
-                ip_task_type=TaskName.lamp_gain.value,
-            ),
             CryonirspTaskExposureConditionsBud(
                 stem_name=CryonirspBudName.solar_gain_exposure_conditions_list.value,
                 ip_task_type=TaskName.solar_gain.value,
@@ -202,8 +205,6 @@ class ParseL0CryonirspLinearizedData(ParseDataBase, InputDatasetMixin):
                 stem_name=CryonirspBudName.polcal_exposure_conditions_list.value,
                 ip_task_type=TaskName.polcal.value,
             ),
-            CryonirspNonDarkAndNonPolcalTaskExposureConditionsBud(),
-            CryonirspPickyDarkExposureConditionsBud(),
             UniqueBud(constant_name=CryonirspBudName.axis_1_type.value, metadata_key="axis_1_type"),
             UniqueBud(constant_name=CryonirspBudName.axis_2_type.value, metadata_key="axis_2_type"),
             UniqueBud(constant_name=CryonirspBudName.axis_3_type.value, metadata_key="axis_3_type"),
@@ -274,10 +275,23 @@ class ParseL0CryonirspSPLinearizedData(ParseL0CryonirspLinearizedData):
                 ip_task_type=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
+            CheckLampGainFramesPickyBud(),
+            CryonirspTaskExposureConditionsBud(
+                stem_name=CryonirspBudName.lamp_gain_exposure_conditions_list.value,
+                ip_task_type=TaskName.lamp_gain.value,
+            ),
+            CryonirspSPConditionalTaskExposureConditionsBud(),
+            CryonirspSPPickyDarkExposureConditionsBud(),
         ]
 
 
 class ParseL0CryonirspCILinearizedData(ParseL0CryonirspLinearizedData):
     """Parse linearity corrected CryoNIRSP-CI input data with CI arm specific constants."""
 
-    pass
+    @property
+    def constant_buds(self) -> list[S]:
+        """Add CryoNIRSP-CI specific constants to common constants."""
+        return super().constant_buds + [
+            CryonirspCIConditionalTaskExposureConditionsBud(),
+            CryonirspCIPickyDarkExposureConditionsBud(),
+        ]

dkist_processing_cryonirsp/tests/conftest.py

@@ -129,7 +129,14 @@ class CryonirspConstantsDb:
         ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),
     )
     POLCAL_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions] | tuple = ()
-    NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions, ...] = (
+    SP_NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST: tuple[ExposureConditions, ...] = (
+        ExposureConditions(100.0, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(1.0, AllowableOpticalDensityFilterNames.OPEN.value),
+        ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),
+    )
+    CI_NON_DARK_AND_NON_POLCAL_AND_NON_LAMP_GAIN_TASK_EXPOSURE_CONDITIONS_LIST: tuple[
+        ExposureConditions, ...
+    ] = (
         ExposureConditions(100.0, AllowableOpticalDensityFilterNames.OPEN.value),
         ExposureConditions(1.0, AllowableOpticalDensityFilterNames.OPEN.value),
         ExposureConditions(0.01, AllowableOpticalDensityFilterNames.OPEN.value),

dkist_processing_cryonirsp/tests/test_dark.py

@@ -34,7 +34,7 @@ def sp_dark_calibration_task(
         200.0, AllowableOpticalDensityFilterNames.NONE.value
     )
     constants_db = CryonirspConstantsDb(
-        NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST=exposure_conditions,
+        SP_NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST=exposure_conditions,
         ARM_ID="SP",
     )
     init_cryonirsp_constants_db(recipe_run_id, constants_db)
@@ -120,7 +120,7 @@ def ci_dark_calibration_task(
     )
 
     constants_db = CryonirspConstantsDb(
-        NON_DARK_AND_NON_POLCAL_TASK_EXPOSURE_CONDITIONS_LIST=exposure_conditions,
+        CI_NON_DARK_AND_NON_POLCAL_AND_NON_LAMP_GAIN_TASK_EXPOSURE_CONDITIONS_LIST=exposure_conditions,
         ARM_ID="CI",
     )
     init_cryonirsp_constants_db(recipe_run_id, constants_db)

dkist_processing_cryonirsp/tests/test_parse.py

@@ -664,8 +664,11 @@ def test_parse_cryonirsp_linearized_incomplete_final_map(
     num_modstates = 2
     num_sub_repeats = 2
 
-    # Needed so the dark picky bud is happy
+    # Needed so the picky buds are happy
     write_dark_frames_to_task(task, exposure_condition=exp_cond, tags=lin_tag)
+    write_solar_gain_frames_to_task(task, exposure_condition=exp_cond, tags=lin_tag)
+    if arm_id == "SP":
+        write_lamp_gain_frames_to_task(task, exposure_condition=exp_cond, tags=lin_tag)
 
     # Needed so the pol checking buds are happy
     write_polcal_frames_to_task(
@@ -884,8 +887,11 @@ def test_parse_cryonirsp_linearized_incomplete_raster_scan(
         translated_header["CNNUMSCN"] = num_scan_steps
         return translated_header
 
-    # Needed so the dark picky bud is happy
+    # Needed so the picky buds are happy
     write_dark_frames_to_task(task, exposure_condition=exp_cond, tags=lin_tag)
+    write_solar_gain_frames_to_task(task, exposure_condition=exp_cond, tags=lin_tag)
+    if arm_id == "SP":
+        write_lamp_gain_frames_to_task(task, exposure_condition=exp_cond, tags=lin_tag)
 
     # Needed so the pol checking buds are happy
     write_polcal_frames_to_task(
@@ -1219,10 +1225,10 @@ def test_parse_cryonirsp_linearized_data_constants(
     assert sorted(task.constants._db_dict["DARK_FRAME_EXPOSURE_CONDITIONS_LIST"]) == sorted(
         [json.loads(json.dumps(condition)) for condition in dark_exp_conditions]
     )
-
-    assert task.constants._db_dict["LAMP_GAIN_EXPOSURE_CONDITIONS_LIST"] == [
-        json.loads(json.dumps(lamp_exp_cond))
-    ]
+    if arm_id == "SP":
+        assert task.constants._db_dict["LAMP_GAIN_EXPOSURE_CONDITIONS_LIST"] == [
+            json.loads(json.dumps(lamp_exp_cond))
+        ]
     assert task.constants._db_dict["SOLAR_GAIN_EXPOSURE_CONDITIONS_LIST"] == [
         json.loads(json.dumps(solar_exp_cond))
     ]
@@ -1326,6 +1332,9 @@ def test_parse_cryonirsp_not_polarimetric_obs(parse_linearized_task, arm_id):
 
     for condition in dark_exp_conditions:
         write_dark_frames_to_task(task, exposure_condition=condition, tags=lin_tag)
+        write_solar_gain_frames_to_task(task, exposure_condition=condition, tags=lin_tag)
+        if arm_id == "SP":
+            write_lamp_gain_frames_to_task(task, exposure_condition=condition, tags=lin_tag)
 
     write_polcal_frames_to_task(
         task,
@@ -1464,11 +1473,11 @@ def test_missing_solar_gain_frames(parse_linearized_task, arm_id):
         num_modstates=1,
     )
 
-    with pytest.raises(ValueError, match="Solar gain frames not found."):
+    with pytest.raises(ValueError, match="solar_gain frames not found."):
         task()
 
 
-@pytest.mark.parametrize("arm_id", ["CI", "SP"])
+@pytest.mark.parametrize("arm_id", ["SP"])
 def test_missing_lamp_gain_frames(parse_linearized_task, arm_id):
     """
     Given: A dataset missing lamp gain frames
@@ -1493,5 +1502,46 @@ def test_missing_lamp_gain_frames(parse_linearized_task, arm_id):
         num_modstates=1,
     )
 
-    with pytest.raises(ValueError, match="Lamp gain frames not found."):
+    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/workflows/ci_l0_processing.py

@@ -47,8 +47,7 @@ l0_pipeline.add_node(task=ParseL0CryonirspCILinearizedData, upstreams=LinearityC
 l0_pipeline.add_node(task=BadPixelMapCalibration, upstreams=ParseL0CryonirspCILinearizedData)
 l0_pipeline.add_node(task=CIBeamBoundariesCalibration, upstreams=BadPixelMapCalibration)
 l0_pipeline.add_node(task=DarkCalibration, upstreams=CIBeamBoundariesCalibration)
-l0_pipeline.add_node(task=LampGainCalibration, upstreams=DarkCalibration)
-l0_pipeline.add_node(task=CISolarGainCalibration, upstreams=LampGainCalibration)
+l0_pipeline.add_node(task=CISolarGainCalibration, upstreams=DarkCalibration)
 l0_pipeline.add_node(task=CIInstrumentPolarizationCalibration, upstreams=CISolarGainCalibration)
 l0_pipeline.add_node(task=CIScienceCalibration, upstreams=CIInstrumentPolarizationCalibration)
 l0_pipeline.add_node(task=CIWriteL1Frame, upstreams=CIScienceCalibration)

dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -63,8 +63,7 @@ full_trial_ci_pipeline.add_node(
 )
 full_trial_ci_pipeline.add_node(task=CIBeamBoundariesCalibration, upstreams=BadPixelMapCalibration)
 full_trial_ci_pipeline.add_node(task=DarkCalibration, upstreams=CIBeamBoundariesCalibration)
-full_trial_ci_pipeline.add_node(task=LampGainCalibration, upstreams=DarkCalibration)
-full_trial_ci_pipeline.add_node(task=CISolarGainCalibration, upstreams=LampGainCalibration)
+full_trial_ci_pipeline.add_node(task=CISolarGainCalibration, upstreams=DarkCalibration)
 full_trial_ci_pipeline.add_node(
     task=CIInstrumentPolarizationCalibration, upstreams=CISolarGainCalibration
 )

{dkist_processing_cryonirsp-1.4.12.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.12
+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
@@ -17,7 +17,7 @@ Requires-Dist: Pillow==10.3.0
 Requires-Dist: astropy==6.1.0
 Requires-Dist: dkist-fits-specifications==4.10.0
 Requires-Dist: dkist-header-validator==5.1.1
-Requires-Dist: dkist-processing-common==10.5.8
+Requires-Dist: dkist-processing-common==10.5.9
 Requires-Dist: dkist-processing-math==2.1.2
 Requires-Dist: dkist-processing-pac==3.1.1
 Requires-Dist: dkist-spectral-lines==3.0.0
@@ -48,7 +48,7 @@ Provides-Extra: asdf
 Requires-Dist: dkist-processing-common[asdf]; extra == "asdf"
 Requires-Dist: dkist-inventory[asdf]==1.5.0; extra == "asdf"
 Provides-Extra: quality
-Requires-Dist: dkist-quality==1.2.0; extra == "quality"
+Requires-Dist: dkist-quality==1.2.1; extra == "quality"
 Provides-Extra: grogu
 Requires-Dist: dkist; extra == "grogu"
 Requires-Dist: pyparsing; extra == "grogu"

{dkist_processing_cryonirsp-1.4.12.dist-info → dkist_processing_cryonirsp-1.4.15.dist-info}/RECORD

@@ -2,16 +2,16 @@ changelog/.gitempty,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dkist_processing_cryonirsp/__init__.py,sha256=Z6-kB7fXXUI-F7Vz1HnEaja2h8qgH9IZExRl1lUxvZg,350
 dkist_processing_cryonirsp/config.py,sha256=xNkUNJ1BeBxJX881mTCIEbirZlD5_5txpV1QqkbfRM0,507
 dkist_processing_cryonirsp/models/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
-dkist_processing_cryonirsp/models/constants.py,sha256=qjXu7iaA-8cw5wZF-EaudWrDb8WDt3ALmRkX0lzBm7g,9629
+dkist_processing_cryonirsp/models/constants.py,sha256=p0HTXr994UHUrDRf3o-S5lb2ic7K2TRrHWl-hTWJUlA,10650
 dkist_processing_cryonirsp/models/exposure_conditions.py,sha256=slFq5-Qz4fRpJKDBabbm4evPWLQVYmT-Uf9rk7nI734,813
 dkist_processing_cryonirsp/models/parameters.py,sha256=oAB_68AY2HdxK8IkvzisPKDI-c2agZeKiE5VIkHkkRI,13422
 dkist_processing_cryonirsp/models/tags.py,sha256=1Q2ag0ud9gx3su-XUqa--gwSnf5di7CGnlkyiEFreRs,4388
 dkist_processing_cryonirsp/models/task_name.py,sha256=xK4AKwgOx2uANbjhr0Q5Q3R9iPxLfkVKxWYY8wWjKhE,439
 dkist_processing_cryonirsp/parsers/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
-dkist_processing_cryonirsp/parsers/check_for_gains.py,sha256=z5DZ4b4gQILb2mv1SowVulpiVGBZPYZNFsM6i6PjM24,2021
+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=Xj466IJyaMXUCudrdTOUFmjsOr_CYENI7BegwwmEjoA,6098
+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
@@ -27,13 +27,13 @@ dkist_processing_cryonirsp/tasks/beam_boundaries_base.py,sha256=N3zk08sRcczoNGIq
 dkist_processing_cryonirsp/tasks/ci_beam_boundaries.py,sha256=N-LDXCzI0JJLvhTM69W0zW6moAPaVzl96h41RTn0wNE,1893
 dkist_processing_cryonirsp/tasks/ci_science.py,sha256=Qa-qSx_TxtXzGGjgN73TDbO1kqxBNlkt2zaBBB43erM,6693
 dkist_processing_cryonirsp/tasks/cryonirsp_base.py,sha256=rVy7vV4il0_B5KXenmCYEcYLNaIQ8_MDiKKn8X6v8yw,2168
-dkist_processing_cryonirsp/tasks/dark.py,sha256=tKzbQoVMe-NdETxY2VIwBxMXCuc1afCTpxpbKiKPf8I,3864
+dkist_processing_cryonirsp/tasks/dark.py,sha256=RAIejLZFYwJcXjrpGlLRnW42xsD5EGjxyHdXvsBUztw,4127
 dkist_processing_cryonirsp/tasks/gain.py,sha256=adrYXgCg0gmDsiczFhyU8kBQsVXj15IEfGrRE2TqVdw,8537
 dkist_processing_cryonirsp/tasks/instrument_polarization.py,sha256=uaQWIcQkw61azIA8J1GaRHegFrpZmjWT4wER3iaRmWE,19526
 dkist_processing_cryonirsp/tasks/l1_output_data.py,sha256=FdL_Dv-YTLgT-xH_uOOUjk4GUYMjbaSDPIg1rIQu_iY,1621
 dkist_processing_cryonirsp/tasks/linearity_correction.py,sha256=-R0iBJDNF9o57GUd5C8YlOL6wyVUzKf5rSDFgu0kpgA,24310
 dkist_processing_cryonirsp/tasks/make_movie_frames.py,sha256=Ql_bg1r1W1m-tTOParAdkllFJEJFdNoE16GgHyhDgdw,13900
-dkist_processing_cryonirsp/tasks/parse.py,sha256=MeqdHk1pb5dBlYQBlJrH3qXm9vzJ7d6nV-eh2cMDJqs,12452
+dkist_processing_cryonirsp/tasks/parse.py,sha256=tDOC2_r8xw0RYBxe3b3Te18Y5dBnRrPtikJmuhmwT88,13117
 dkist_processing_cryonirsp/tasks/quality_metrics.py,sha256=r4mS1Qp88tHlbNKsqed-MOsFT_6Zbhr5H8-4hrx9OGw,11424
 dkist_processing_cryonirsp/tasks/science_base.py,sha256=-BjPNPI5jjiBR7K8p_9fa4vYCEUEdOFx7c2AC5EmFoE,17619
 dkist_processing_cryonirsp/tasks/sp_beam_boundaries.py,sha256=3bdj6W2H_UiOhmj2xHvADwOzojteLsTL9RkTwvzB6_M,10300
@@ -49,7 +49,7 @@ dkist_processing_cryonirsp/tasks/mixin/intermediate_frame.py,sha256=fFeIvuA4AtkQ
 dkist_processing_cryonirsp/tasks/mixin/linearized_frame.py,sha256=oyiMA_rzBUYtlmh1ilfE5DkuIe4FFiyptaYjcU8-joA,10176
 dkist_processing_cryonirsp/tasks/mixin/shift_measurements.py,sha256=7ToSy9uOJ_JrFfd-X225wqW_laq4xoRJkBiAPanfb_g,11225
 dkist_processing_cryonirsp/tests/__init__.py,sha256=m6UekKftTahNJ3W5K3mZSz4Y4ZZpHRxF_ZAxuaKYL7o,12
-dkist_processing_cryonirsp/tests/conftest.py,sha256=QZSEWZvgmWsqv2310AInV4m6NqweNJYJt-HNWgec-B4,17104
+dkist_processing_cryonirsp/tests/conftest.py,sha256=_yAXaaaiyw4iQOGETN2sgelJsf1_AwjicXv1e1oqdqw,17485
 dkist_processing_cryonirsp/tests/header_models.py,sha256=Ny4h5lS54bGRPDo4nOzvJgNWMzFY9DDs1IQorr_r3s8,20591
 dkist_processing_cryonirsp/tests/test_assemble_movie.py,sha256=YNZINIFXR9kZBlE1AIvjlVmwwhZJeVYOOPk7Q8IVkcI,6222
 dkist_processing_cryonirsp/tests/test_assemble_qualilty.py,sha256=upk-oUqVBHGK3F0eemshLpAPrnfh9mbeuZXow4E1Rmc,16859
@@ -59,13 +59,13 @@ dkist_processing_cryonirsp/tests/test_ci_science.py,sha256=GdzUR5csW2uoJBc_y5gYE
 dkist_processing_cryonirsp/tests/test_corrections.py,sha256=5nY8MccZcNDyQYV8IEokqtY_YrP08TZ-H7WQNioK-A0,4650
 dkist_processing_cryonirsp/tests/test_cryo_base.py,sha256=lF27S1aBmMc5wRWNPKjkXZTyGDPvLo59IubYAb1McsU,7172
 dkist_processing_cryonirsp/tests/test_cryo_constants.py,sha256=VbjM1vZYRa_057yK_aP2ta6JyT7Ob1ou4SbGEVIIKH0,2715
-dkist_processing_cryonirsp/tests/test_dark.py,sha256=n1DYuzM4iFOSHsC8GxAeQcQItj2mFH9WkUT0KZDyM2A,11953
+dkist_processing_cryonirsp/tests/test_dark.py,sha256=wUeRG0Gw_oQ6HxKa7nozLJA_nwKZQB0nDKnpobf5Ksw,11977
 dkist_processing_cryonirsp/tests/test_gain.py,sha256=YUgcGFh325TZBT9BbkzlkbapVJL4skTE1FVhsFNhUc8,10854
 dkist_processing_cryonirsp/tests/test_instrument_polarization.py,sha256=GgZmPJVtsEploGFEZsddwXAh9QtnoOUdywEPdkT_l-s,19276
 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=PsTco2G1_APKEPeSpqpYfsIkNXSM_GtY_jbgkNtj8r8,53539
+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
@@ -82,9 +82,9 @@ dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py,sha256=f00YZl
 dkist_processing_cryonirsp/tests/local_trial_workflows/linearize_only.py,sha256=kl9yrE1EbgxNn__x4q0WYoZIvS8zefcOPbQQdxB4_ZE,3280
 dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py,sha256=14XonDUbMWh6n1AwtPaDLCeSvoHCzn-MNHCkHLB4VUc,19330
 dkist_processing_cryonirsp/workflows/__init__.py,sha256=iEbV3oiKmkfmdZjeNJxqw08IIZnYSroq-2b-ARpkLFQ,112
-dkist_processing_cryonirsp/workflows/ci_l0_processing.py,sha256=6yw_mn8mxZ551ubJSHUyWd8l_Nwx1uL6yW1y_qBL5a8,3866
+dkist_processing_cryonirsp/workflows/ci_l0_processing.py,sha256=T-BOvDDWHzs5BDH5ctSBjzGgD6Xez52AnDXsH5_7Bms,3788
 dkist_processing_cryonirsp/workflows/sp_l0_processing.py,sha256=A74av8E8mL9WzI4vWI2GbhVrRFQ7JCMlGAioEjXkkCU,4219
-dkist_processing_cryonirsp/workflows/trial_workflows.py,sha256=x7odG41cz6a2Em0PQIDh3k1RaCl-pR0WC2-v6o2M9FE,8177
+dkist_processing_cryonirsp/workflows/trial_workflows.py,sha256=UvSvsho6gYWliJ_sRN_uYbt5jBdA68hVyLiyr6X5QTo,8088
 docs/Makefile,sha256=qnlVz6PuBqE39NfHWuUnHhNEA-EFgT2-WJNNNy9ttfk,4598
 docs/bad_pixel_calibration.rst,sha256=bHRclUItBA1QbGlek36B1yN5WHN53WkfjKUvZaq_j2I,2452
 docs/beam_angle_calculation.rst,sha256=-yUPFRl6SbPBIj-wOwylEymQDMQnkay7kAIAiubpQT8,2941
@@ -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.12.dist-info/METADATA,sha256=YmvnDGYliANbqB7v2tPOIQMiPlgcabXAcqZTHpgqMuU,8410
-dkist_processing_cryonirsp-1.4.12.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dkist_processing_cryonirsp-1.4.12.dist-info/top_level.txt,sha256=Sm9b1ddKnsF9Bh3mqDOct1Sm7k8I9aN7vGHgpmu-MlQ,51
-dkist_processing_cryonirsp-1.4.12.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,,