dkist-processing-dlnirsp 0.32.2__tar.gz → 0.32.3__tar.gz

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/CHANGELOG.rst

@@ -1,3 +1,12 @@
+v0.32.3 (2025-11-04)
+====================
+
+Misc
+----
+
+- Replace metadata key strings with members of the string enum DlnirspMetadataKey. (`#111 <https://bitbucket.org/dkistdc/dkist-processing-dlnirsp/pull-requests/111>`__)
+
+
 v0.32.2 (2025-11-03)
 ====================
 

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-dlnirsp
-Version: 0.32.2
+Version: 0.32.3
 Summary: Science processing code for the DLNIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -76,6 +76,7 @@ Requires-Dist: Flask-Login==0.6.3; extra == "frozen"
 Requires-Dist: Flask-SQLAlchemy==2.5.1; extra == "frozen"
 Requires-Dist: Flask-Session==0.5.0; extra == "frozen"
 Requires-Dist: Flask-WTF==1.2.2; extra == "frozen"
+Requires-Dist: ImageIO==2.37.2; extra == "frozen"
 Requires-Dist: Jinja2==3.1.6; extra == "frozen"
 Requires-Dist: Mako==1.3.10; extra == "frozen"
 Requires-Dist: MarkupSafe==3.0.3; extra == "frozen"
@@ -123,8 +124,8 @@ Requires-Dist: attrs==25.4.0; extra == "frozen"
 Requires-Dist: babel==2.17.0; extra == "frozen"
 Requires-Dist: billiard==4.2.2; extra == "frozen"
 Requires-Dist: blinker==1.9.0; extra == "frozen"
-Requires-Dist: boto3==1.40.64; extra == "frozen"
-Requires-Dist: botocore==1.40.64; extra == "frozen"
+Requires-Dist: boto3==1.40.65; extra == "frozen"
+Requires-Dist: botocore==1.40.65; extra == "frozen"
 Requires-Dist: cachelib==0.13.0; extra == "frozen"
 Requires-Dist: celery==5.3.1; extra == "frozen"
 Requires-Dist: certifi==2025.10.5; extra == "frozen"
@@ -149,7 +150,7 @@ Requires-Dist: dill==0.4.0; extra == "frozen"
 Requires-Dist: dkist-header-validator==5.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-common==11.8.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==6.0.0; extra == "frozen"
-Requires-Dist: dkist-processing-dlnirsp==0.32.2; extra == "frozen"
+Requires-Dist: dkist-processing-dlnirsp==0.32.3; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.1; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.1.7; extra == "frozen"
@@ -174,7 +175,6 @@ Requires-Dist: httpcore==1.0.9; extra == "frozen"
 Requires-Dist: httpx==0.28.1; extra == "frozen"
 Requires-Dist: humanize==4.14.0; extra == "frozen"
 Requires-Dist: idna==3.11; extra == "frozen"
-Requires-Dist: imageio==2.37.0; extra == "frozen"
 Requires-Dist: imageio-ffmpeg==0.6.0; extra == "frozen"
 Requires-Dist: importlib_metadata==8.7.0; extra == "frozen"
 Requires-Dist: inflection==0.5.1; extra == "frozen"

dkist_processing_dlnirsp-0.32.3/dkist_processing_dlnirsp/models/fits_access.py

@@ -0,0 +1,32 @@
+"""DLNIRSP control of FITS key names and values."""
+
+from enum import StrEnum
+
+from dkist_processing_common.models.fits_access import MetadataKey
+
+
+class DlnirspMetadataKey(StrEnum):
+    """Controlled list of names for FITS metadata header keys."""
+
+    crpix_1 = "CRPIX1"
+    crpix_2 = "CRPIX2"
+    modulator_spin_mode = "DLMOD"
+    camera_readout_mode = "DLCAMSMD"
+    num_frames_in_ramp = "DLCAMNS"
+    current_frame_in_ramp = "DLCAMCUR"
+    arm_id = "DLARMID"
+    camera_sample_sequence = "DLCAMSSQ"
+    polarimeter_mode = "DLPOLMD"
+    number_of_modulator_states = "DLNUMST"
+    modulator_state = "DLSTNUM"
+    num_mosaic_repeats = "DLMOSNRP"
+    mosaic_num = "DLCURMOS"
+    num_X_tiles = "DLNSSTPX"
+    X_tile_num = "DLCSTPX"
+    num_Y_tiles = "DLNSSTPY"
+    Y_tile_num = "DLCSTPY"
+    num_dither_steps = "DLDMODE"
+    dither_step = "DLCURSTP"
+    arm_position_mm = "DLARMPS"
+    grating_position_deg = "DLGRTAN"
+    grating_constant_inverse_mm = "DLGRTCN"

dkist_processing_dlnirsp-0.32.3/dkist_processing_dlnirsp/parsers/dlnirsp_l0_fits_access.py

@@ -0,0 +1,99 @@
+"""DLNIRSP FitsAccess classes for raw and linearized data."""
+
+from astropy.io import fits
+from dkist_processing_common.parsers.l0_fits_access import L0FitsAccess
+
+from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
+
+
+class DlnirspRampFitsAccess(L0FitsAccess):
+    """
+    Class to provide easy access to L0 headers for non-linearized (raw) DLNIRSP data.
+
+    i.e. instead of <DlnirspL0FitsAccess>.header['weird_key'] this class lets us use <DlnirspL0FitsAccess>.nice_key instead
+
+    Parameters
+    ----------
+    hdu :
+        Fits L0 header object
+
+    name : str
+        The name of the file that was loaded into this FitsAccess object
+
+    auto_squeeze : bool
+        When set to True, dimensions of length 1 will be removed from the array
+    """
+
+    def __init__(
+        self,
+        hdu: fits.ImageHDU | fits.PrimaryHDU | fits.CompImageHDU,
+        name: str | None = None,
+        auto_squeeze: bool = True,
+    ):
+        super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
+
+        self.modulator_spin_mode: str = self.header[DlnirspMetadataKey.modulator_spin_mode]
+        self.camera_readout_mode: str = self.header.get(
+            DlnirspMetadataKey.camera_readout_mode, "DEFAULT_VISIBLE_CAMERA"
+        )
+        self.num_frames_in_ramp: int = self.header.get(DlnirspMetadataKey.num_frames_in_ramp, -99)
+        self.current_frame_in_ramp: int = self.header.get(
+            DlnirspMetadataKey.current_frame_in_ramp, -88
+        )
+        self.arm_id: str = self.header[DlnirspMetadataKey.arm_id]
+        self.camera_sample_sequence: str = self.header.get(
+            DlnirspMetadataKey.camera_sample_sequence, "VISIBLE_CAMERA_SEQUENCE"
+        )
+
+
+class DlnirspL0FitsAccess(L0FitsAccess):
+    """
+    Class to provide easy access to L0 headers for linearized (ready for processing) DLNIRSP data.
+
+    i.e. instead of <DlnirspL0FitsAccess>.header['weird_key'] this class lets us use <DlnirspL0FitsAccess>.nice_key instead
+
+    Parameters
+    ----------
+    hdu :
+        Fits L0 header object
+
+    name : str
+        The name of the file that was loaded into this FitsAccess object
+
+    auto_squeeze : bool
+        When set to True, dimensions of length 1 will be removed from the array
+    """
+
+    def __init__(
+        self,
+        hdu: fits.ImageHDU | fits.PrimaryHDU | fits.CompImageHDU,
+        name: str | None = None,
+        auto_squeeze: bool = True,
+    ):
+        super().__init__(hdu=hdu, name=name, auto_squeeze=auto_squeeze)
+
+        self.crpix_1: float = self.header[DlnirspMetadataKey.crpix_1]
+        self.crpix_2: float = self.header[DlnirspMetadataKey.crpix_2]
+        self.arm_id: str = self.header[DlnirspMetadataKey.arm_id]
+        self.polarimeter_mode: str = self.header[DlnirspMetadataKey.polarimeter_mode]
+        self.number_of_modulator_states: int = self.header[
+            DlnirspMetadataKey.number_of_modulator_states
+        ]
+        self.modulator_state: int = self.header[DlnirspMetadataKey.modulator_state]
+        self.num_mosaic_repeats: int = self.header[DlnirspMetadataKey.num_mosaic_repeats]
+        self.mosaic_num: int = self.header[DlnirspMetadataKey.mosaic_num]
+        self.num_X_tiles: int = self.header[DlnirspMetadataKey.num_X_tiles]
+        self.X_tile_num: int = self.header[DlnirspMetadataKey.X_tile_num]
+        self.num_Y_tiles: int = self.header[DlnirspMetadataKey.num_Y_tiles]
+        self.Y_tile_num: int = self.header[DlnirspMetadataKey.Y_tile_num]
+        # DLDMODE is a bool in the header; the number of dither steps is either 1 or 2, corresponding to dither
+        # mode being True or False, respectively
+        self.num_dither_steps: int = int(self.header[DlnirspMetadataKey.num_dither_steps]) + 1
+        # Same with DLCURSTP. We'll index the dither loop at 0 so `False` is the first step and `True` is the second
+        # Use `get` because this key only exists if DLDMODE is `True`
+        self.dither_step: int = int(self.header.get(DlnirspMetadataKey.dither_step, False))
+        self.arm_position_mm: float = self.header[DlnirspMetadataKey.arm_position_mm]
+        self.grating_position_deg: float = self.header[DlnirspMetadataKey.grating_position_deg]
+        self.grating_constant_inverse_mm: float = self.header[
+            DlnirspMetadataKey.grating_constant_inverse_mm
+        ]

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/parsers/task.py

@@ -1,15 +1,11 @@
 """Custom parsers to identify task sub-groupings not captured by a single header key."""
 
-from typing import Callable
-
-from dkist_processing_common.models.flower_pot import SpilledDirt
+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.near_bud import NearFloatBud
 from dkist_processing_common.parsers.single_value_single_key_flower import (
     SingleValueSingleKeyFlower,
 )
-from dkist_processing_common.parsers.unique_bud import UniqueBud
 
 from dkist_processing_dlnirsp.parsers.dlnirsp_l0_fits_access import DlnirspL0FitsAccess
 
@@ -41,7 +37,7 @@ class DlnirspTaskTypeFlower(SingleValueSingleKeyFlower):
     """Flower to find the DLNIRSP task type."""
 
     def __init__(self):
-        super().__init__(tag_stem_name=StemName.task.value, metadata_key="ip_task_type")
+        super().__init__(tag_stem_name=StemName.task.value, metadata_key=MetadataKey.ip_task_type)
 
     def setter(self, fits_obj: DlnirspL0FitsAccess):
         """

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/parsers/time.py

@@ -2,6 +2,7 @@
 
 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.unique_bud import TaskUniqueBud
@@ -17,7 +18,7 @@ class DLnirspSolarGainIpStartTimeBud(TaskUniqueBud):
     def __init__(self):
         super().__init__(
             constant_name=DlnirspBudName.solar_gain_ip_start_time.value,
-            metadata_key="ip_start_time",
+            metadata_key=MetadataKey.ip_start_time,
             ip_task_types=TaskName.solar_gain.value,
             task_type_parsing_function=parse_header_ip_task,
         )

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/parsers/wavelength.py

@@ -1,5 +1,6 @@
 """Bud to get the wavelength."""
 
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.parsers.unique_bud import UniqueBud
 
@@ -11,7 +12,10 @@ class ObserveWavelengthBud(UniqueBud):
     """Bud to find the wavelength."""
 
     def __init__(self):
-        super().__init__(constant_name=DlnirspBudName.wavelength.value, metadata_key="wavelength")
+        super().__init__(
+            constant_name=DlnirspBudName.wavelength.value,
+            metadata_key=MetadataKey.wavelength,
+        )
 
     def setter(self, fits_obj: DlnirspL0FitsAccess):
         """

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/tasks/parse.py

@@ -2,6 +2,7 @@
 
 from typing import TypeVar
 
+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.cs_step import CSStepFlower
@@ -22,6 +23,7 @@ from dkist_processing_common.tasks import default_constant_bud_factory
 from dkist_processing_common.tasks import default_tag_flower_factory
 
 from dkist_processing_dlnirsp.models.constants import DlnirspBudName
+from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
 from dkist_processing_dlnirsp.models.parameters import DlnirspParsingParameters
 from dkist_processing_dlnirsp.models.tags import DlnirspStemName
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
@@ -72,7 +74,9 @@ class ParseL0DlnirspRampData(ParseDataBase):
             # Time Obs is the unique identifier for each ramp in the data set
             DlnirspTimeObsBud(),
             # This is used to determine whether we need to do any linearity correction at all.
-            UniqueBud(constant_name=DlnirspBudName.arm_id.value, metadata_key="arm_id"),
+            UniqueBud(
+                constant_name=DlnirspBudName.arm_id.value, metadata_key=DlnirspMetadataKey.arm_id
+            ),
         ]
 
     @property
@@ -81,12 +85,12 @@ class ParseL0DlnirspRampData(ParseDataBase):
         return [
             SingleValueSingleKeyFlower(
                 tag_stem_name=DlnirspStemName.current_frame_in_ramp.value,
-                metadata_key="current_frame_in_ramp",
+                metadata_key=DlnirspMetadataKey.current_frame_in_ramp,
             ),
             # time_obs is a unique identifier for all raw frames in a single ramp
             SingleValueSingleKeyFlower(
                 tag_stem_name=DlnirspStemName.time_obs.value,
-                metadata_key="time_obs",
+                metadata_key=MetadataKey.time_obs,
             ),
         ]
 
@@ -144,12 +148,13 @@ class ParseL0DlnirspLinearizedData(ParseDataBase):
             DLnirspSolarGainIpStartTimeBud(),
             NumCSStepBud(max_cs_step_time_sec=self.parameters.max_cs_step_time_sec),
             UniqueBud(
-                constant_name=DlnirspBudName.polarimeter_mode.value, metadata_key="polarimeter_mode"
+                constant_name=DlnirspBudName.polarimeter_mode.value,
+                metadata_key=DlnirspMetadataKey.polarimeter_mode,
             ),
             RetarderNameBud(),
             UniqueBud(
                 constant_name=DlnirspBudName.num_modstates.value,
-                metadata_key="number_of_modulator_states",
+                metadata_key=DlnirspMetadataKey.number_of_modulator_states,
             ),
             NumMosaicRepeatsBud(
                 crpix_correction_method=self.parameters.wcs_crpix_correction_method,
@@ -189,20 +194,20 @@ class ParseL0DlnirspLinearizedData(ParseDataBase):
             ),
             TaskNearFloatBud(
                 constant_name=DlnirspBudName.arm_position_mm.value,
-                metadata_key="arm_position_mm",
+                metadata_key=DlnirspMetadataKey.arm_position_mm,
                 ip_task_types=[TaskName.solar_gain.value, TaskName.observe.value],
                 tolerance=0.01,
                 task_type_parsing_function=parse_header_ip_task,
             ),
             TaskUniqueBud(
                 constant_name=DlnirspBudName.grating_constant_inverse_mm.value,
-                metadata_key="grating_constant_inverse_mm",
+                metadata_key=DlnirspMetadataKey.grating_constant_inverse_mm,
                 ip_task_types=[TaskName.solar_gain.value, TaskName.observe.value],
                 task_type_parsing_function=parse_header_ip_task,
             ),
             TaskNearFloatBud(
                 constant_name=DlnirspBudName.grating_position_deg.value,
-                metadata_key="grating_position_deg",
+                metadata_key=DlnirspMetadataKey.grating_position_deg,
                 ip_task_types=[TaskName.solar_gain.value, TaskName.observe.value],
                 tolerance=0.01,
                 task_type_parsing_function=parse_header_ip_task,
@@ -216,14 +221,17 @@ class ParseL0DlnirspLinearizedData(ParseDataBase):
             DlnirspTaskTypeFlower(),
             PolcalTaskFlower(),
             SingleValueSingleKeyFlower(
-                tag_stem_name=DlnirspStemName.arm_id.value, metadata_key="arm_id"
+                tag_stem_name=DlnirspStemName.arm_id.value,
+                metadata_key=DlnirspMetadataKey.arm_id,
             ),
             ExposureTimeFlower(),
             SingleValueSingleKeyFlower(
-                tag_stem_name=DlnirspStemName.modstate.value, metadata_key="modulator_state"
+                tag_stem_name=DlnirspStemName.modstate.value,
+                metadata_key=DlnirspMetadataKey.modulator_state,
             ),
             SingleValueSingleKeyFlower(
-                tag_stem_name=DlnirspStemName.mosaic_num.value, metadata_key="mosaic_num"
+                tag_stem_name=DlnirspStemName.mosaic_num.value,
+                metadata_key=DlnirspMetadataKey.mosaic_num,
             ),
             MosaicStepXFlower(
                 crpix_correction_method=self.parameters.wcs_crpix_correction_method,
@@ -234,7 +242,8 @@ class ParseL0DlnirspLinearizedData(ParseDataBase):
                 bin_crpix_to_multiple_of=self.parameters.parse_bin_crpix_to_multiple_of,
             ),
             SingleValueSingleKeyFlower(
-                tag_stem_name=DlnirspStemName.dither_step.value, metadata_key="dither_step"
+                tag_stem_name=DlnirspStemName.dither_step.value,
+                metadata_key=DlnirspMetadataKey.dither_step,
             ),
             CSStepFlower(max_cs_step_time_sec=self.parameters.max_cs_step_time_sec),
         ]

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/tasks/science.py

@@ -18,6 +18,7 @@ from dkist_processing_common.codecs.fits import fits_access_decoder
 from dkist_processing_common.codecs.fits import fits_array_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import EXP_TIME_ROUND_DIGITS
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tasks.mixin.quality import QualityMixin
@@ -29,6 +30,7 @@ from dkist_processing_pac.optics.telescope import Telescope
 from dkist_service_configuration.logging import logger
 from scipy.spatial import Delaunay
 
+from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
 from dkist_processing_dlnirsp.parsers.dlnirsp_l0_fits_access import DlnirspL0FitsAccess
 from dkist_processing_dlnirsp.parsers.wcs_corrections import correct_crpix_values
@@ -738,7 +740,7 @@ class ScienceCalibration(
         date_end = (Time(sorted_obj_list[-1].time_obs) + exp_time).isot
 
         header = sorted_obj_list[0].header
-        header["DATE-BEG"] = date_beg
+        header[MetadataKey.time_obs] = date_beg
         header["DATE-END"] = date_end
 
         return header
@@ -773,13 +775,13 @@ class ScienceCalibration(
 
         crpix_correction_method = self.parameters.wcs_crpix_correction_method
         cached_info_logger(f"Applying CRPIX correction method '{crpix_correction_method}'")
-        OG_crpix1 = header["CRPIX1"]
-        OG_crpix2 = header["CRPIX2"]
+        OG_crpix1 = header[DlnirspMetadataKey.crpix_1]
+        OG_crpix2 = header[DlnirspMetadataKey.crpix_2]
 
         new_crpix1, new_crpix2 = correct_crpix_values(OG_crpix1, OG_crpix2, crpix_correction_method)
 
-        header["CRPIX1"] = new_crpix1
-        header["CRPIX2"] = new_crpix2
+        header[DlnirspMetadataKey.crpix_1] = new_crpix1
+        header[DlnirspMetadataKey.crpix_2] = new_crpix2
 
         return header
 

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/tasks/write_l1.py

@@ -12,6 +12,7 @@ from dkist_processing_common.tasks import WriteL1Frame
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_dlnirsp.models.constants import DlnirspConstants
+from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
 
 cached_info_logger = cache(logger.info)
@@ -83,7 +84,7 @@ class DlnirspWriteL1Frame(WriteL1Frame):
             header[f"DPNAME{axis_index}"] = "dither step"
             header[f"DWNAME{axis_index}"] = "time"
             header[f"DUNIT{axis_index}"] = "s"
-            header[f"DINDEX{axis_index}"] = int(header["DLCURSTP"]) + 1
+            header[f"DINDEX{axis_index}"] = int(header[DlnirspMetadataKey.dither_step]) + 1
 
         if self.constants.correct_for_polarization:
             cached_info_logger("Polarimetric data detected")
@@ -211,7 +212,7 @@ class DlnirspWriteL1Frame(WriteL1Frame):
             tile_as_temporal_axis = False
             temporal_axis_size = num_mosaic_repeats
             pname = "mosaic repeat number"
-            dindex = header["DLCURMOS"]
+            dindex = header[DlnirspMetadataKey.mosaic_num]
 
         elif num_mosaic_repeats == 1 and (
             (num_X_tiles == 1 and num_Y_tiles == 1) or (num_X_tiles > 1 and num_Y_tiles > 1)
@@ -224,14 +225,14 @@ class DlnirspWriteL1Frame(WriteL1Frame):
             tile_as_temporal_axis = True
             temporal_axis_size = num_X_tiles
             pname = "repeat number"
-            dindex = header["DLCSTPX"]
+            dindex = header[DlnirspMetadataKey.X_tile_num]
 
         elif num_mosaic_repeats == 1 and num_X_tiles == 1 and num_Y_tiles > 1:
             has_temporal_axis = True
             tile_as_temporal_axis = True
             temporal_axis_size = num_Y_tiles
             pname = "repeat number"
-            dindex = header["DLCSTPY"]
+            dindex = header[DlnirspMetadataKey.Y_tile_num]
 
         else:
             raise ValueError(

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/tests/local_trial_workflows/local_trial_dev_mockers.py

@@ -9,6 +9,7 @@ from dkist_processing_common.codecs.fits import fits_array_decoder
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.codecs.fits import fits_hdulist_encoder
 from dkist_processing_common.models.constants import BudName
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tasks import WorkflowTaskBase
@@ -17,6 +18,7 @@ from dkist_processing_math.statistics import average_numpy_arrays
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_dlnirsp.models.constants import DlnirspBudName
+from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
 from dkist_processing_dlnirsp.tasks import DlnirspWriteL1Frame
 from dkist_processing_dlnirsp.tasks.dlnirsp_base import DlnirspTaskBase
@@ -87,7 +89,7 @@ def permissive_write_l1_task(force_intensity_only: bool):
             self, header: fits.Header, stokes: Literal["I", "Q", "U", "V"]
         ) -> fits.Header:
             if force_intensity_only:
-                header["DLPOLMD"] = "Stokes I"
+                header[MetadataKey.polarimeter_mode] = "Stokes I"
 
             return super().add_dataset_headers(header=header, stokes=stokes)
 
@@ -138,11 +140,11 @@ class TagPolcasAsScience(DlnirspTaskBase):
                 avg_array = average_numpy_arrays(arrays=arrays)
 
                 hdul = fits.HDUList([fits.PrimaryHDU(data=avg_array, header=first_header)])
-                hdul[0].header["DLCSTPX"] = 1
-                hdul[0].header["DLCSTPY"] = 1
-                hdul[0].header["DLMOSNRP"] = self.constants.num_cs_steps
-                hdul[0].header["DLCURMOS"] = cs_step
-                hdul[0].header["XPOSURE"] = obs_exp_time
+                hdul[0].header[DlnirspMetadataKey.X_tile_num] = 1
+                hdul[0].header[DlnirspMetadataKey.Y_tile_num] = 1
+                hdul[0].header[DlnirspMetadataKey.num_mosaic_repeats] = self.constants.num_cs_steps
+                hdul[0].header[DlnirspMetadataKey.mosaic_num] = cs_step
+                hdul[0].header[MetadataKey.fpa_exposure_time_ms] = obs_exp_time
 
                 new_tags = [
                     DlnirspTag.task_observe(),
@@ -186,11 +188,11 @@ class TagSingleSolarGainAsScience(DlnirspTaskBase):
         avg_array = average_numpy_arrays(arrays=arrays)
 
         hdul = fits.HDUList([fits.PrimaryHDU(data=avg_array, header=first_header)])
-        hdul[0].header["DLCSTPX"] = 1
-        hdul[0].header["DLCSTPY"] = 1
-        hdul[0].header["DLMOSNRP"] = 1
-        hdul[0].header["DLCURMOS"] = 0
-        hdul[0].header["DLDMODE"] = False
+        hdul[0].header[DlnirspMetadataKey.X_tile_num] = 1
+        hdul[0].header[DlnirspMetadataKey.Y_tile_num] = 1
+        hdul[0].header[DlnirspMetadataKey.num_mosaic_repeats] = 1
+        hdul[0].header[DlnirspMetadataKey.mosaic_num] = 0
+        hdul[0].header[DlnirspMetadataKey.num_dither_steps] = False
 
         new_tags = [
             DlnirspTag.task_observe(),
@@ -237,11 +239,11 @@ class TagModulatedSolarGainsAsScience(DlnirspTaskBase):
             avg_array = average_numpy_arrays(arrays=arrays)
 
             hdul = fits.HDUList([fits.PrimaryHDU(data=avg_array, header=first_header)])
-            hdul[0].header["DLCSTPX"] = 1
-            hdul[0].header["DLCSTPY"] = 1
-            hdul[0].header["DLMOSNRP"] = 1
-            hdul[0].header["DLCURMOS"] = 0
-            hdul[0].header["DLDMODE"] = False
+            hdul[0].header[DlnirspMetadataKey.X_tile_num] = 1
+            hdul[0].header[DlnirspMetadataKey.Y_tile_num] = 1
+            hdul[0].header[DlnirspMetadataKey.num_mosaic_repeats] = 1
+            hdul[0].header[DlnirspMetadataKey.mosaic_num] = 0
+            hdul[0].header[DlnirspMetadataKey.num_dither_steps] = False
 
             new_tags = [
                 DlnirspTag.task_observe(),

{dkist_processing_dlnirsp-0.32.2 → dkist_processing_dlnirsp-0.32.3}/dkist_processing_dlnirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -20,6 +20,7 @@ from loguru import logger
 
 from dkist_processing_dlnirsp.models.constants import DlnirspBudName
 from dkist_processing_dlnirsp.models.constants import DlnirspConstants
+from dkist_processing_dlnirsp.models.fits_access import DlnirspMetadataKey
 from dkist_processing_dlnirsp.models.tags import DlnirspTag
 from dkist_processing_dlnirsp.models.task_name import DlnirspTaskName
 from dkist_processing_dlnirsp.tasks.dlnirsp_base import DlnirspTaskBase
@@ -38,7 +39,7 @@ def get_camera_number(scratch_dir: Path, suffix: str = "FITS", data_ext: int = 1
     header_list = [fits.getheader(f, ext=data_ext) for f in file_list]
     table = Table(header_list)
 
-    camera_IDs = np.unique(table["DLARMID"])
+    camera_IDs = np.unique(table[DlnirspMetadataKey.arm_id])
     if camera_IDs.size > 1:
         raise ValueError(f"Found more than one arm in scratch dir. Found {camera_IDs}")