dkist-processing-visp 5.8.0__tar.gz → 5.8.1__tar.gz

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/CHANGELOG.rst

@@ -1,3 +1,12 @@
+v5.8.1 (2026-08-28)
+===================
+
+Bugfixes
+--------
+
+- Allow multiple solar gain observations to contribute to solar gain calibration while using only the observation nearest in time to the science frames for wavelength calibration. (`#332 <https://bitbucket.org/dkistdc/dkist-processing-visp/pull-requests/332>`__)
+
+
 v5.8.0 (2026-08-25)
 ===================
 

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-visp
-Version: 5.8.0
+Version: 5.8.1
 Summary: Science processing code for the ViSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -118,15 +118,15 @@ Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: beautifulsoup4==4.15.0; extra == "frozen"
 Requires-Dist: billiard==4.2.4; extra == "frozen"
 Requires-Dist: bleach==6.4.0; extra == "frozen"
-Requires-Dist: boto3==1.43.79; extra == "frozen"
-Requires-Dist: botocore==1.43.79; extra == "frozen"
+Requires-Dist: boto3==1.43.82; extra == "frozen"
+Requires-Dist: botocore==1.43.82; extra == "frozen"
 Requires-Dist: cachetools==7.1.7; extra == "frozen"
 Requires-Dist: cadwyn==7.0.0; extra == "frozen"
 Requires-Dist: celery==5.6.3; extra == "frozen"
 Requires-Dist: certifi==2026.7.22; extra == "frozen"
 Requires-Dist: cffi==2.1.1; extra == "frozen"
 Requires-Dist: charset-normalizer==3.5.1; extra == "frozen"
-Requires-Dist: click==8.4.2; extra == "frozen"
+Requires-Dist: click==8.5.0; extra == "frozen"
 Requires-Dist: click-didyoumean==0.3.1; extra == "frozen"
 Requires-Dist: click-plugins==1.1.1.2; extra == "frozen"
 Requires-Dist: click-repl==0.3.0; extra == "frozen"
@@ -135,7 +135,7 @@ Requires-Dist: comm==0.2.3; extra == "frozen"
 Requires-Dist: contourpy==1.3.3; extra == "frozen"
 Requires-Dist: cron_descriptor==2.1.0; extra == "frozen"
 Requires-Dist: croniter==6.2.4; extra == "frozen"
-Requires-Dist: cryptography==50.0.0; extra == "frozen"
+Requires-Dist: cryptography==50.0.1; extra == "frozen"
 Requires-Dist: cycler==0.12.1; extra == "frozen"
 Requires-Dist: debugpy==1.8.21; extra == "frozen"
 Requires-Dist: decorator==5.3.1; extra == "frozen"
@@ -146,7 +146,7 @@ Requires-Dist: dkist-processing-common==14.4.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.5.0; extra == "frozen"
 Requires-Dist: dkist-processing-math==2.2.3; extra == "frozen"
 Requires-Dist: dkist-processing-pac==3.1.2; extra == "frozen"
-Requires-Dist: dkist-processing-visp==5.8.0; extra == "frozen"
+Requires-Dist: dkist-processing-visp==5.8.1; extra == "frozen"
 Requires-Dist: dkist-service-configuration==4.3.0; extra == "frozen"
 Requires-Dist: dkist-spectral-lines==3.0.1; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.28.1; extra == "frozen"
@@ -162,11 +162,11 @@ Requires-Dist: fqdn==1.5.1; extra == "frozen"
 Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2026.7.0; extra == "frozen"
 Requires-Dist: globus-sdk==4.9.0; extra == "frozen"
-Requires-Dist: googleapis-common-protos==1.75.1; extra == "frozen"
+Requires-Dist: googleapis-common-protos==1.75.2; extra == "frozen"
 Requires-Dist: gqlclient==2.0.0; extra == "frozen"
 Requires-Dist: greenback==1.3.0; extra == "frozen"
 Requires-Dist: greenlet==3.5.5; extra == "frozen"
-Requires-Dist: grpcio==1.83.0; extra == "frozen"
+Requires-Dist: grpcio==1.83.1; extra == "frozen"
 Requires-Dist: h11==0.16.0; extra == "frozen"
 Requires-Dist: httpcore==1.0.9; extra == "frozen"
 Requires-Dist: httptools==0.8.0; extra == "frozen"
@@ -176,7 +176,7 @@ Requires-Dist: idna==3.19; extra == "frozen"
 Requires-Dist: imageio-ffmpeg==0.6.0; extra == "frozen"
 Requires-Dist: importlib_metadata==9.0.0; extra == "frozen"
 Requires-Dist: ipykernel==7.3.0; extra == "frozen"
-Requires-Dist: ipython==9.16.1; extra == "frozen"
+Requires-Dist: ipython==9.17.0; extra == "frozen"
 Requires-Dist: ipython_pygments_lexers==1.1.1; extra == "frozen"
 Requires-Dist: isoduration==20.11.0; extra == "frozen"
 Requires-Dist: itsdangerous==2.2.0; extra == "frozen"
@@ -190,14 +190,14 @@ Requires-Dist: jsonschema-specifications==2025.9.1; extra == "frozen"
 Requires-Dist: jupyter-events==0.12.1; extra == "frozen"
 Requires-Dist: jupyter-lsp==2.3.1; extra == "frozen"
 Requires-Dist: jupyter_builder==1.2.2; extra == "frozen"
-Requires-Dist: jupyter_client==8.9.1; extra == "frozen"
+Requires-Dist: jupyter_client==8.10.0; extra == "frozen"
 Requires-Dist: jupyter_core==5.9.1; extra == "frozen"
-Requires-Dist: jupyter_server==2.20.0; extra == "frozen"
+Requires-Dist: jupyter_server==2.21.0; extra == "frozen"
 Requires-Dist: jupyter_server_terminals==0.5.4; extra == "frozen"
 Requires-Dist: jupyterlab==4.6.3; extra == "frozen"
 Requires-Dist: jupyterlab_pygments==0.3.0; extra == "frozen"
 Requires-Dist: jupyterlab_server==2.28.0; extra == "frozen"
-Requires-Dist: kiwisolver==1.5.0; extra == "frozen"
+Requires-Dist: kiwisolver==1.5.1; extra == "frozen"
 Requires-Dist: kombu==5.6.2; extra == "frozen"
 Requires-Dist: lark==1.3.1; extra == "frozen"
 Requires-Dist: lazy-loader==0.5; extra == "frozen"
@@ -264,7 +264,7 @@ Requires-Dist: pexpect==4.9.0; extra == "frozen"
 Requires-Dist: pika==1.4.4; extra == "frozen"
 Requires-Dist: pillow==10.4.0; extra == "frozen"
 Requires-Dist: pip==26.2.1; extra == "frozen"
-Requires-Dist: platformdirs==4.11.4; extra == "frozen"
+Requires-Dist: platformdirs==4.11.5; extra == "frozen"
 Requires-Dist: pluggy==1.6.0; extra == "frozen"
 Requires-Dist: pooch==1.9.0; extra == "frozen"
 Requires-Dist: proglog==0.1.12; extra == "frozen"
@@ -279,10 +279,10 @@ Requires-Dist: psycopg2-binary==2.9.12; extra == "frozen"
 Requires-Dist: ptyprocess==0.7.0; extra == "frozen"
 Requires-Dist: pure_eval==0.2.3; extra == "frozen"
 Requires-Dist: pycparser==3.0; extra == "frozen"
-Requires-Dist: pydantic==2.13.4; extra == "frozen"
+Requires-Dist: pydantic==2.13.5; extra == "frozen"
 Requires-Dist: pydantic-extra-types==2.11.1; extra == "frozen"
 Requires-Dist: pydantic-settings==2.15.0; extra == "frozen"
-Requires-Dist: pydantic_core==2.46.4; extra == "frozen"
+Requires-Dist: pydantic_core==2.46.5; extra == "frozen"
 Requires-Dist: pyerfa==2.0.1.5; extra == "frozen"
 Requires-Dist: pygtrie==2.5.0; extra == "frozen"
 Requires-Dist: pyparsing==3.3.2; extra == "frozen"
@@ -334,7 +334,7 @@ Requires-Dist: tinycss2==1.5.1; extra == "frozen"
 Requires-Dist: tornado==6.5.8; extra == "frozen"
 Requires-Dist: tqdm==4.70.0; extra == "frozen"
 Requires-Dist: traitlets==5.16.1; extra == "frozen"
-Requires-Dist: typer==0.27.1; extra == "frozen"
+Requires-Dist: typer==0.27.2; extra == "frozen"
 Requires-Dist: typing-inspection==0.4.4; extra == "frozen"
 Requires-Dist: typing_extensions==4.16.0; extra == "frozen"
 Requires-Dist: tzdata==2026.3; extra == "frozen"
@@ -354,7 +354,7 @@ Requires-Dist: wcwidth==0.8.2; extra == "frozen"
 Requires-Dist: webcolors==25.10.0; extra == "frozen"
 Requires-Dist: webencodings==0.6.1; extra == "frozen"
 Requires-Dist: websocket-client==1.9.0; extra == "frozen"
-Requires-Dist: websockets==17.0.1; extra == "frozen"
+Requires-Dist: websockets==17.1; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
 Requires-Dist: wrapt==2.3.0; extra == "frozen"
 Requires-Dist: yamale==6.1.0; extra == "frozen"

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/dkist_processing_visp/models/constants.py

@@ -28,7 +28,7 @@ class VispBudName(Enum):
     incident_light_angle_deg = "INCIDENT_LIGHT_ANGLE_DEG"
     reflected_light_angle_deg = "REFLECTED_LIGHT_ANGLE_DEG"
     grating_constant_inverse_mm = "GRATING_CONSTANT_INVERSE_MM"
-    solar_gain_ip_start_time = "SOLAR_GAIN_IP_START_TIME"
+    solar_gain_ip_start_times = "SOLAR_GAIN_IP_START_TIMES"
     axis_1_type = "AXIS_1_TYPE"
     axis_2_type = "AXIS_2_TYPE"
     axis_3_type = "AXIS_3_TYPE"
@@ -171,9 +171,9 @@ class VispConstants(ConstantsBase):
         return self._db_dict[VispBudName.grating_constant_inverse_mm] / u.mm
 
     @property
-    def solar_gain_ip_start_time(self) -> str:
-        """Return the start time of the SOLAR GAIN Instrument Program."""
-        return self._db_dict[VispBudName.solar_gain_ip_start_time]
+    def solar_gain_ip_start_times(self) -> list[str]:
+        """Return the start times of the SOLAR GAIN Instrument Programs."""
+        return list(self._db_dict[VispBudName.solar_gain_ip_start_times])
 
     @property
     def axis_1_type(self) -> str:

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/dkist_processing_visp/models/tags.py

@@ -16,6 +16,7 @@ class VispStemName(str, Enum):
     modstate = "MODSTATE"
     file_id = "FILE_ID"
     map_scan = "MAP_SCAN"
+    solar_gain_ip_start_time = "SOLAR_GAIN_IP_START_TIME"
 
 
 class VispTag(Tag):
@@ -64,11 +65,21 @@ class VispTag(Tag):
         """
         return cls.format_tag(VispStemName.map_scan, map_scan_num)
 
+    @classmethod
+    def solar_gain_ip_start_time(cls, ip_start_time: str) -> str:
+        """Tag a solar gain frame or intermediate by its IP start time."""
+        return cls.format_tag(VispStemName.solar_gain_ip_start_time, ip_start_time)
+
     @classmethod
     def task_characteristic_spectra(cls) -> str:
         """Tags intermediate characteristic spectra."""
         return cls.format_tag(StemName.task, VispTaskName.solar_char_spec.value)
 
+    @classmethod
+    def task_wavecal_characteristic_spectra(cls) -> str:
+        """Tag the characteristic spectra derived for wavelength calibration."""
+        return cls.format_tag(StemName.task, VispTaskName.wavecal_solar_char_spec.value)
+
     @classmethod
     def task_wavelength_calibration(cls) -> str:
         """Tags wavelength calibration."""

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/dkist_processing_visp/models/task_name.py

@@ -8,4 +8,5 @@ class VispTaskName(str, Enum):
 
     background = "BACKGROUND"
     solar_char_spec = "SOLAR_CHAR_SPEC"
+    wavecal_solar_char_spec = "WAVECAL_SOLAR_CHAR_SPEC"
     wavelength_calibration = "WAVELENGTH_CALIBRATION"

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/dkist_processing_visp/parsers/time.py

@@ -13,10 +13,15 @@ from dkist_processing_common.models.flower_pot import SpilledDirt
 from dkist_processing_common.models.flower_pot import Thorn
 from dkist_processing_common.models.tags import EXP_TIME_ROUND_DIGITS
 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_common.parsers.task import passthrough_header_ip_task
 from dkist_processing_common.parsers.time import TaskDatetimeBudBase
 
 from dkist_processing_visp.models.constants import VispBudName
+from dkist_processing_visp.models.tags import VispStemName
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
 
 
@@ -133,6 +138,42 @@ class DarkReadoutExpTimePickyBud(ListStem):
         return Thorn
 
 
+class SolarGainIpStartTimesBud(SetStem):
+    """Collect the unique IP start times from all solar gain observations."""
+
+    def __init__(self):
+        super().__init__(stem_name=VispBudName.solar_gain_ip_start_times.value)
+        self.metadata_key = MetadataKey.ip_start_time.name
+
+    def setter(self, fits_obj: VispL0FitsAccess) -> str | Type[SpilledDirt]:
+        """Collect start times only from frames parsed as solar gains."""
+        task = parse_header_ip_task_with_gains(fits_obj)
+        if task.casefold() == TaskName.solar_gain.value.casefold():
+            return getattr(fits_obj, self.metadata_key)
+        return SpilledDirt
+
+    def getter(self) -> tuple[str, ...]:
+        """Return the unique start times in chronological order."""
+        return tuple(sorted(self.value_set))
+
+
+class SolarGainIpStartTimeFlower(SingleValueSingleKeyFlower):
+    """Tag each input solar gain frame with its IP start time."""
+
+    def __init__(self):
+        super().__init__(
+            tag_stem_name=VispStemName.solar_gain_ip_start_time,
+            metadata_key=MetadataKey.ip_start_time,
+        )
+
+    def setter(self, fits_obj: VispL0FitsAccess) -> str | Type[SpilledDirt]:
+        """Apply the tag only to frames parsed as solar gains."""
+        task = parse_header_ip_task_with_gains(fits_obj)
+        if task.casefold() == TaskName.solar_gain.value.casefold():
+            return super().setter(fits_obj)
+        return SpilledDirt
+
+
 class TaskDateEndBud(TaskDatetimeBudBase):
     """Class for the date end task Bud."""
 

{dkist_processing_visp-5.8.0 → dkist_processing_visp-5.8.1}/dkist_processing_visp/tasks/parse.py

@@ -39,6 +39,8 @@ from dkist_processing_visp.parsers.spectrograph_configuration import IncidentLig
 from dkist_processing_visp.parsers.spectrograph_configuration import ReflectedLightAngleBud
 from dkist_processing_visp.parsers.time import DarkReadoutExpTimePickyBud
 from dkist_processing_visp.parsers.time import NonDarkNonPolcalTaskReadoutExpTimesBud
+from dkist_processing_visp.parsers.time import SolarGainIpStartTimeFlower
+from dkist_processing_visp.parsers.time import SolarGainIpStartTimesBud
 from dkist_processing_visp.parsers.time import TaskDateEndBud
 from dkist_processing_visp.parsers.visp_l0_fits_access import VispL0FitsAccess
 
@@ -105,12 +107,7 @@ class ParseL0VispInputData(ParseL0InputDataBase):
                 ip_task_types=[TaskName.observe.value, TaskName.solar_gain.value],
                 task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
-            TaskUniqueBud(
-                constant_name=VispBudName.solar_gain_ip_start_time.value,
-                metadata_key=MetadataKey.ip_start_time,
-                ip_task_types=TaskName.solar_gain,
-                task_type_parsing_function=parse_header_ip_task_with_gains,
-            ),
+            SolarGainIpStartTimesBud(),
             TaskExposureTimesBud(
                 stem_name=VispBudName.lamp_exposure_times.value,
                 ip_task_types=TaskName.lamp_gain.value,
@@ -199,4 +196,5 @@ class ParseL0VispInputData(ParseL0InputDataBase):
             ModulatorStateFlower(),
             ExposureTimeFlower(),
             ReadoutExpTimeFlower(),
+            SolarGainIpStartTimeFlower(),
         ]