dkist-processing-dlnirsp 0.32.9__py3-none-any.whl → 0.33.0__py3-none-any.whl

dkist_processing_dlnirsp/models/constants.py

@@ -30,6 +30,7 @@ class DlnirspBudName(Enum):
     grating_constant_inverse_mm = "GRATING_CONSTANT_INVERSE_MM"
     grating_position_deg = "GRATING_POSITION_DEG"
     solar_gain_ip_start_time = "SOLAR_GAIN_IP_START_TIME"
+    obs_ip_end_time = "OBS_IP_END_TIME"
 
 
 VIS_ARM_NAMES = ["VIS".casefold()]
@@ -170,3 +171,8 @@ class DlnirspConstants(ConstantsBase):
     def grating_position_deg(self) -> u.Quantity:
         """Grating position angle (deg)."""
         return self._db_dict[DlnirspBudName.grating_position_deg.value] * u.deg
+
+    @property
+    def obs_ip_end_time(self) -> str:
+        """Return the IP end time of the observe OP."""
+        return self._db_dict[DlnirspBudName.obs_ip_end_time.value]

dkist_processing_dlnirsp/models/parameters.py

@@ -114,7 +114,7 @@ class DlnirspParameters(ParameterBase, ParameterArmIdMixin):
         return self._load_param_value_from_fits(param_obj)
 
     @property
-    def bad_pixel_gain_median_smooth_size(self) -> tuple[int, int]:
+    def bad_pixel_gain_median_smooth_size(self) -> list[int]:
         """
         Define the size of the median window used when smoothing lamp gain data to identify bad pixels.
 
@@ -123,7 +123,7 @@ class DlnirspParameters(ParameterBase, ParameterArmIdMixin):
         return self._find_most_recent_past_value("dlnirsp_bad_pixel_gain_median_smooth_size")
 
     @property
-    def bad_pixel_dark_median_smooth_size(self) -> tuple[int, int]:
+    def bad_pixel_dark_median_smooth_size(self) -> list[int]:
         """
         Define the size of the median window used when smoothing dark sigma data to identify bad pixels.
 
@@ -193,7 +193,7 @@ class DlnirspParameters(ParameterBase, ParameterArmIdMixin):
         return self._find_most_recent_past_value("dlnirsp_pac_fit_mode")
 
     @property
-    def lamp_despike_kernel(self) -> (float, float):
+    def lamp_despike_kernel(self) -> list[float]:
         """Return the (x, y) stddev of the Gaussian kernel used for lamp despiking."""
         return self._find_most_recent_past_value("dlnirsp_lamp_despike_kernel")
 
@@ -356,3 +356,33 @@ class DlnirspParameters(ParameterBase, ParameterArmIdMixin):
         The specified method must exist in `~dkist_processing_dlnirsp.tasks.science.ScienceCalibration.apply_WCS_corrections`.
         """
         return self._find_most_recent_past_value("dlnirsp_wcs_crpix_correction_method")
+
+    @property
+    def movie_core_wave_value_nm(self) -> float:
+        """Define the wavelength to use when plotting a spectral line core in quicklook movies."""
+        return self._find_parameter_for_arm("dlnirsp_movie_core_wave_value_nm")
+
+    @property
+    def movie_cont_wave_value_nm(self) -> float:
+        """Define te wavelength to use when plotting continuum signal in quicklook movies."""
+        return self._find_parameter_for_arm("dlnirsp_movie_cont_wave_value_nm")
+
+    @property
+    def movie_vertical_nan_slices(self) -> list[slice]:
+        """
+        Define slices of known-to-be-bad data regions in the remapped IFU cube's "vertical" dimension.
+
+        These regions are caused by slight over-sizing of the group ID array. There is no data here, but it gets mapped
+        to the IFU cube and "looks" bad if we don't mask it out.
+        """
+        index_list = self._find_most_recent_past_value("dlnirsp_movie_vertical_nan_slices")
+        return [slice(i[0], i[1]) for i in index_list]
+
+    @property
+    def movie_nan_replacement_kernel_shape(self) -> list[int]:
+        """
+        Define the shape of the kernel used to `interpolate_and_replace_nans` when building mosaic images for the movie.
+
+        The kernel will be exactly `np.ones(movie_nan_replacement_kernel_shape)`.
+        """
+        return self._find_most_recent_past_value("dlnirsp_movie_nan_replacement_kernel_shape")

dkist_processing_dlnirsp/parsers/task.py

@@ -2,37 +2,14 @@
 
 from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import StemName
-from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.parsers.single_value_single_key_flower import (
     SingleValueSingleKeyFlower,
 )
+from dkist_processing_common.parsers.task import parse_header_ip_task_with_gains
 
 from dkist_processing_dlnirsp.parsers.dlnirsp_l0_fits_access import DlnirspL0FitsAccess
 
 
-def parse_header_ip_task(fits_obj: DlnirspL0FitsAccess) -> str:
-    """
-    Parse DLNIRSP tasks from a combination of header values.
-
-    Parameters
-    ----------
-    fits_obj:
-        A single FitsAccess object
-    """
-    # Distinguish between lamp and solar gains
-    if (
-        fits_obj.ip_task_type == "gain"
-        and fits_obj.gos_level3_status == "lamp"
-        and fits_obj.gos_level3_lamp_status == "on"
-    ):
-        return TaskName.lamp_gain.value
-    if fits_obj.ip_task_type == "gain" and fits_obj.gos_level3_status == "clear":
-        return TaskName.solar_gain.value
-
-    # Everything else is unchanged
-    return fits_obj.ip_task_type
-
-
 class DlnirspTaskTypeFlower(SingleValueSingleKeyFlower):
     """Flower to find the DLNIRSP task type."""
 
@@ -48,4 +25,4 @@ class DlnirspTaskTypeFlower(SingleValueSingleKeyFlower):
         fits_obj:
             A single FitsAccess object
         """
-        return parse_header_ip_task(fits_obj)
+        return parse_header_ip_task_with_gains(fits_obj)

dkist_processing_dlnirsp/parsers/time.py

@@ -5,11 +5,11 @@ from typing import Hashable
 from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.flower_pot import Stem
 from dkist_processing_common.models.task_name import TaskName
+from dkist_processing_common.parsers.task import parse_header_ip_task_with_gains
 from dkist_processing_common.parsers.unique_bud import TaskUniqueBud
 
 from dkist_processing_dlnirsp.models.constants import DlnirspBudName
 from dkist_processing_dlnirsp.parsers.dlnirsp_l0_fits_access import DlnirspRampFitsAccess
-from dkist_processing_dlnirsp.parsers.task import parse_header_ip_task
 
 
 class DLnirspSolarGainIpStartTimeBud(TaskUniqueBud):
@@ -20,7 +20,7 @@ class DLnirspSolarGainIpStartTimeBud(TaskUniqueBud):
             constant_name=DlnirspBudName.solar_gain_ip_start_time.value,
             metadata_key=MetadataKey.ip_start_time,
             ip_task_types=TaskName.solar_gain.value,
-            task_type_parsing_function=parse_header_ip_task,
+            task_type_parsing_function=parse_header_ip_task_with_gains,
         )
 
 

dkist_processing_dlnirsp/tasks/__init__.py

@@ -1,6 +1,5 @@
 """Top-level tasks that can be assembled into a pipeline workflow."""
 
-from dkist_processing_dlnirsp.tasks.assemble_movie import *
 from dkist_processing_dlnirsp.tasks.bad_pixel_map import *
 from dkist_processing_dlnirsp.tasks.dark import *
 from dkist_processing_dlnirsp.tasks.geometric import *
@@ -9,7 +8,7 @@ from dkist_processing_dlnirsp.tasks.instrument_polarization import *
 from dkist_processing_dlnirsp.tasks.l1_output_data import *
 from dkist_processing_dlnirsp.tasks.lamp import *
 from dkist_processing_dlnirsp.tasks.linearity_correction import *
-from dkist_processing_dlnirsp.tasks.make_movie_frames import *
+from dkist_processing_dlnirsp.tasks.movie import *
 from dkist_processing_dlnirsp.tasks.parse import *
 from dkist_processing_dlnirsp.tasks.quality_metrics import *
 from dkist_processing_dlnirsp.tasks.science import *