dkist-processing-cryonirsp 0.0.61__tar.gz → 0.0.63__tar.gz

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/CHANGELOG.rst

@@ -1,3 +1,31 @@
+v0.0.63 (2024-05-20)
+====================
+
+Bugfixes
+--------
+
+- Polcal fit/modulation matrix quality metrics are now correctly rendered in quality report. (`#125 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/125>`__)
+- Correctly render L0 quality metrics (individual frame and dataset average and RMS values for dark, lamp, and solar frames).
+  Previously these had been missing from quality reports of polarimetric datasets. (`#125 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/125>`__)
+
+
+Misc
+----
+
+- Remove `CryoStemName.modstate` and `CryonirspTag.modstate`. Both of these already exist in `*-common` and can be used directly from there. (`#125 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/125>`__)
+- Update `dkist-processing-common` to v6.2.4. This fixes a bug that could cause the quality report to fail to render if
+  the demodulation matrices were fit with the (very old) "use_M12" fit mode. (`#126 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/126>`__)
+
+
+v0.0.62 (2024-05-16)
+====================
+
+Misc
+----
+
+- Bumped dkist-fits-specifications to 4.2.0 (`#124 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/124>`__)
+
+
 v0.0.61 (2024-05-09)
 ====================
 

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist_processing_cryonirsp
-Version: 0.0.61
+Version: 0.0.63
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Home-page: https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
 Author: NSO / AURA

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/models/tags.py

@@ -3,7 +3,6 @@ from enum import Enum
 
 from dkist_processing_common.models.tags import StemName
 from dkist_processing_common.models.tags import Tag
-from dkist_processing_common.models.task_name import TaskName
 
 from dkist_processing_cryonirsp.models.exposure_conditions import ExposureConditions
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
@@ -18,7 +17,6 @@ class CryonirspStemName(str, Enum):
     curr_frame_in_ramp = "CURR_FRAME_IN_RAMP"
     time_obs = "TIME_OBS"
     meas_num = "MEAS_NUM"
-    modstate = "MODSTATE"
     map_scan = "MAP_SCAN"
     exposure_conditions = "EXPOSURE_CONDITIONS"
 
@@ -74,22 +72,6 @@ class CryonirspTag(Tag):
         """
         return cls.format_tag(CryonirspStemName.map_scan, map_scan)
 
-    @classmethod
-    def modstate(cls, modstate: int) -> str:
-        """
-        Tags by the current modstate number.
-
-        Parameters
-        ----------
-        modstate
-            The current scan step number
-
-        Returns
-        -------
-        The formatted tag string
-        """
-        return cls.format_tag(CryonirspStemName.modstate, modstate)
-
     @classmethod
     def linearized(cls) -> str:
         """

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/parsers/modstates.py

@@ -2,11 +2,11 @@
 from typing import Type
 
 from dkist_processing_common.models.flower_pot import SpilledDirt
+from dkist_processing_common.models.tags import StemName
 from dkist_processing_common.parsers.single_value_single_key_flower import (
     SingleValueSingleKeyFlower,
 )
 
-from dkist_processing_cryonirsp.models.tags import CryonirspStemName
 from dkist_processing_cryonirsp.parsers.cryonirsp_l0_fits_access import CryonirspL0FitsAccess
 
 
@@ -14,9 +14,7 @@ class ModstateNumberFlower(SingleValueSingleKeyFlower):
     """Flower for a modstate number."""
 
     def __init__(self):
-        super().__init__(
-            tag_stem_name=CryonirspStemName.modstate.value, metadata_key="modulator_state"
-        )
+        super().__init__(tag_stem_name=StemName.modstate.value, metadata_key="modulator_state")
 
     def setter(self, fits_obj: CryonirspL0FitsAccess) -> Type[SpilledDirt] | int:
         """
@@ -27,8 +25,6 @@ class ModstateNumberFlower(SingleValueSingleKeyFlower):
         fits_obj:
             A single FitsAccess object
         """
-        if fits_obj.ip_task_type != "observe" and fits_obj.ip_task_type != "polcal":
-            return SpilledDirt
         # Some intensity data incorrectly has modulator state = 0
         if getattr(fits_obj, self.metadata_key) == 0:
             return 1

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tasks/instrument_polarization.py

@@ -23,6 +23,15 @@ from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase
 __all__ = ["CIInstrumentPolarizationCalibration", "SPInstrumentPolarizationCalibration"]
 
 
+def generate_polcal_quality_label(arm: str, beam: int) -> str:
+    """
+    Make a quality label given an arm and beam.
+
+    Defined here so we don't have to remember what our labels are in the L1 output data task.
+    """
+    return f"{arm} Beam {beam}"
+
+
 class InstrumentPolarizationCalibrationBase(CryonirspTaskBase, ABC):
     """
     Base task class for instrument polarization for a CryoNIRSP calibration run.
@@ -402,7 +411,7 @@ class CIInstrumentPolarizationCalibration(InstrumentPolarizationCalibrationBase)
         """Record various quality metrics from PolCal fits."""
         self.quality_store_polcal_results(
             polcal_fitter=polcal_fitter,
-            label=f"CryoNIRSP CI beam {beam}",
+            label=generate_polcal_quality_label(arm="CI", beam=beam),
             bins_1=self.parameters.polcal_num_spatial_bins,
             bins_2=self.parameters.polcal_num_spatial_bins,
             bin_1_type="spatial",
@@ -421,7 +430,7 @@ class SPInstrumentPolarizationCalibration(InstrumentPolarizationCalibrationBase)
         """Record various quality metrics from PolCal fits."""
         self.quality_store_polcal_results(
             polcal_fitter=polcal_fitter,
-            label=f"CryoNIRSP SP beam {beam}",
+            label=generate_polcal_quality_label(arm="SP", beam=beam),
             bins_1=self.parameters.polcal_num_spatial_bins,
             bins_2=self.parameters.polcal_num_spectral_bins,
             bin_1_type="spatial",

dkist_processing_cryonirsp-0.0.63/dkist_processing_cryonirsp/tasks/l1_output_data.py

@@ -0,0 +1,44 @@
+"""Subclasses of AssembleQualityData that cause the correct polcal metrics to build."""
+from typing import Type
+
+from dkist_processing_common.models.constants import ConstantsBase
+from dkist_processing_common.tasks import AssembleQualityData
+
+__all__ = ["CIAssembleQualityData", "SPAssembleQualityData"]
+
+from dkist_processing_cryonirsp.models.constants import CryonirspConstants
+from dkist_processing_cryonirsp.tasks.instrument_polarization import generate_polcal_quality_label
+
+
+class CIAssembleQualityData(AssembleQualityData):
+    """Subclass just so that the polcal_label_list can be populated."""
+
+    @property
+    def constants_model_class(self) -> Type[CryonirspConstants]:
+        """Grab the Cryo constants so we can have the number of beams."""
+        return CryonirspConstants
+
+    @property
+    def polcal_label_list(self) -> list[str]:
+        """Return label(s) for Cryo CI."""
+        return [
+            generate_polcal_quality_label(arm="CI", beam=beam)
+            for beam in range(1, self.constants.num_beams + 1)
+        ]
+
+
+class SPAssembleQualityData(AssembleQualityData):
+    """Subclass just so that the polcal_label_list can be populated."""
+
+    @property
+    def constants_model_class(self) -> Type[CryonirspConstants]:
+        """Grab the Cryo constants so we can have the number of beams."""
+        return CryonirspConstants
+
+    @property
+    def polcal_label_list(self) -> list[str]:
+        """Return labels for beams 1 and 2."""
+        return [
+            generate_polcal_quality_label(arm="SP", beam=beam)
+            for beam in range(1, self.constants.num_beams + 1)
+        ]

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/conftest.py

@@ -284,7 +284,7 @@ def cryonirsp_testing_parameters_factory(
     class CryonirspTestingParameters:
         cryonirsp_polcal_num_spatial_bins: int = 1
         cryonirsp_polcal_num_spectral_bins: int = 1
-        cryonirsp_polcal_pac_fit_mode: str = "use_M12"
+        cryonirsp_polcal_pac_fit_mode: str = "use_M12_I_sys_per_step"
         cryonirsp_polcal_pac_init_set: str = "OCCal_VIS"
         cryonirsp_geo_upsample_factor: int = 100
         cryonirsp_geo_max_shift: int = 80

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/header_models.py

@@ -372,10 +372,12 @@ class ModulatedLampGainHeaders(SimpleModulatedHeaders):
         exposure_condition: ExposureConditions,
         start_date: str = "2023-01-01T01:23:45",
         modstate_length_sec: float = 0.5,
+        num_modstates: int = 1,
+        modstate: int = 1,
     ):
         super().__init__(
-            num_modstates=1,
-            modstate=1,
+            num_modstates=num_modstates,
+            modstate=modstate,
             array_shape=array_shape,
             task="gain",
             exposure_condition=exposure_condition,
@@ -403,10 +405,12 @@ class ModulatedSolarGainHeaders(SimpleModulatedHeaders):
         exposure_condition: ExposureConditions,
         start_date: str = "2023-01-01T01:23:45",
         modstate_length_sec: float = 0.5,
+        num_modstates: int = 1,
+        modstate: int = 1,
     ):
         super().__init__(
-            num_modstates=1,
-            modstate=1,
+            num_modstates=num_modstates,
+            modstate=modstate,
             array_shape=array_shape,
             task="gain",
             exposure_condition=exposure_condition,
@@ -436,10 +440,12 @@ class ModulatedDarkHeaders(SimpleModulatedHeaders):
         exposure_condition: ExposureConditions,
         start_date: str = "2023-01-01T01:23:45",
         modstate_length_sec: float = 0.5,
+        num_modstates: int = 1,
+        modstate: int = 1,
     ):
         super().__init__(
-            num_modstates=1,
-            modstate=1,
+            num_modstates=num_modstates,
+            modstate=modstate,
             array_shape=array_shape,
             task="dark",
             exposure_condition=exposure_condition,

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py

@@ -406,12 +406,15 @@ def main(
             )
         else:
             raise ValueError(f"Did not recognize {arm_id = }")
+
         manual_processing_run.run_task(task=QualityL1Metrics)
         manual_processing_run.run_task(task=CryonirspL1QualityMetrics)
+
         if arm_id == "SP":
             manual_processing_run.run_task(task=SPAssembleQualityData)
         elif arm_id == "CI":
             manual_processing_run.run_task(task=CIAssembleQualityData)
+
         manual_processing_run.run_task(task=ValidateL1Output)
 
         if transfer_trial_data:

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -171,15 +171,24 @@ class SaveTaskTags(WorkflowTaskBase):
     def relative_save_file(self) -> str:
         return "default_sav.asdf"
 
+    @property
+    def tag_lists_to_save(self) -> list[list[str]] | list[str]:
+        return [[CryonirspTag.task(self.task_str), CryonirspTag.intermediate()]]
+
     def run(self):
         file_tag_dict = dict()
-        path_list = self.read(tags=[CryonirspTag.task(self.task_str), CryonirspTag.intermediate()])
-        save_dir = self.scratch.workflow_base_path / Path(self.relative_save_file).stem
-        save_dir.mkdir(exist_ok=True)
-        for p in path_list:
-            copied_path = shutil.copy(str(p), save_dir)
-            tags = self.tags(p)
-            file_tag_dict[copied_path] = tags
+        tag_list_list = self.tag_lists_to_save
+        if isinstance(tag_list_list[0], str):
+            tag_list_list = [tag_list_list]
+
+        for tags_to_save in tag_list_list:
+            path_list = self.read(tags=tags_to_save)
+            save_dir = self.scratch.workflow_base_path / Path(self.relative_save_file).stem
+            save_dir.mkdir(exist_ok=True)
+            for p in path_list:
+                copied_path = shutil.copy(str(p), save_dir)
+                tags = self.tags(p)
+                file_tag_dict[copied_path] = tags
 
         full_save_file = self.scratch.workflow_base_path / self.relative_save_file
         tree = {"file_tag_dict": file_tag_dict}
@@ -216,6 +225,14 @@ class SaveGeometricCal(WorkflowTaskBase):
                 tags=[CryonirspTag.task_geometric_sepectral_shifts(), CryonirspTag.intermediate()]
             )
         )
+        path_list += list(
+            self.read(
+                tags=[
+                    CryonirspTag.quality("TASK_TYPES"),
+                    CryonirspTag.workflow_task("SPGeometricCalibration"),
+                ]
+            )
+        )
         save_dir = self.scratch.workflow_base_path / Path(relative_save_file).stem
         save_dir.mkdir(exist_ok=True)
         for p in path_list:
@@ -277,6 +294,12 @@ class SaveDarkCal(SaveTaskTags):
     def relative_save_file(self) -> str:
         return "dark_cal.asdf"
 
+    @property
+    def tag_lists_to_save(self) -> list[list[str]]:
+        return super().tag_lists_to_save + [
+            [CryonirspTag.quality("TASK_TYPES"), CryonirspTag.workflow_task("DarkCalibration")]
+        ]
+
 
 class LoadDarkCal(LoadTaskTags):
     @property
@@ -293,6 +316,12 @@ class SaveLampCal(SaveTaskTags):
     def relative_save_file(self) -> str:
         return "lamp_cal.asdf"
 
+    @property
+    def tag_lists_to_save(self) -> list[list[str]]:
+        return super().tag_lists_to_save + [
+            [CryonirspTag.quality("TASK_TYPES"), CryonirspTag.workflow_task("LampGainCalibration")],
+        ]
+
 
 class LoadLampCal(LoadTaskTags):
     @property
@@ -309,6 +338,19 @@ class SaveSolarCal(SaveTaskTags):
     def relative_save_file(self) -> str:
         return "solar_cal.asdf"
 
+    @property
+    def tag_lists_to_save(self) -> list[list[str]]:
+        return super().tag_lists_to_save + [
+            [
+                CryonirspTag.quality("TASK_TYPES"),
+                CryonirspTag.workflow_task("CISolarGainCalibration"),
+            ],
+            [
+                CryonirspTag.quality("TASK_TYPES"),
+                CryonirspTag.workflow_task("SPSolarGainCalibration"),
+            ],
+        ]
+
 
 class LoadSolarCal(LoadTaskTags):
     @property
@@ -325,6 +367,19 @@ class SaveInstPolCal(SaveTaskTags):
     def relative_save_file(self) -> str:
         return "inst_pol_cal.asdf"
 
+    @property
+    def tag_lists_to_save(self) -> list[list[str]]:
+        return super().tag_lists_to_save + [
+            [
+                CryonirspTag.quality("TASK_TYPES"),
+                CryonirspTag.workflow_task("CIInstrumentPolarizationCalibration"),
+            ],
+            [
+                CryonirspTag.quality("TASK_TYPES"),
+                CryonirspTag.workflow_task("SPInstrumentPolarizationCalibration"),
+            ],
+        ]
+
 
 class LoadInstPolCal(LoadTaskTags):
     @property

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/test_assemble_qualilty.py

@@ -21,8 +21,13 @@ from dkist_processing_cryonirsp.tests.conftest import CryonirspConstantsDb
 
 
 @pytest.fixture(scope="function", params=["CI", "SP"])
-def cryo_assemble_quality_data_task(tmp_path, recipe_run_id, request) -> AssembleQualityData:
+def cryo_assemble_quality_data_task(
+    tmp_path, recipe_run_id, init_cryonirsp_constants_db, request
+) -> AssembleQualityData:
     arm_id = request.param
+    init_cryonirsp_constants_db(
+        recipe_run_id=recipe_run_id, constants_obj=CryonirspConstantsDb(ARM_ID=arm_id)
+    )
     if arm_id == "CI":
         with CIAssembleQualityData(
             recipe_run_id=recipe_run_id,
@@ -228,7 +233,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
                 "bin_1_str": "bin1",
                 "bin_2_str": "bin2",
                 "total_bins": 100,
-                "num_steps": 2,
+                "num_varied_I_sys": 2,
             },
             ["QUALITY_POLCAL_LOCAL_PAR_VALS", "QUALITY_TASK_CI BEAM 1"],
         ),

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/test_instrument_polarization.py

@@ -46,7 +46,7 @@ class DummyPolcalFitter(PolcalFitter):
             super().__init__(
                 local_dresser=local_dresser,
                 global_dresser=global_dresser,
-                fit_mode="use_M12",
+                fit_mode="use_M12_I_sys_per_step",
                 init_set="OCCal_VIS",
                 _dont_fit=True,
             )
@@ -411,7 +411,7 @@ def test_ci_instrument_polarization_calibration_task(
 
         quality_mocker.assert_any_call(
             polcal_fitter=ANY,
-            label=f"CryoNIRSP CI beam {beam}",
+            label=f"CI Beam {beam}",
             bins_1=task.parameters.polcal_num_spatial_bins,
             bins_2=task.parameters.polcal_num_spatial_bins,
             bin_1_type="spatial",
@@ -447,7 +447,7 @@ def test_sp_instrument_polarization_calibration_task(
 
         quality_mocker.assert_any_call(
             polcal_fitter=ANY,
-            label=f"CryoNIRSP SP beam {beam}",
+            label=f"SP Beam {beam}",
             bins_1=task.parameters.polcal_num_spatial_bins,
             bins_2=task.parameters.polcal_num_spectral_bins,
             bin_1_type="spatial",

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp/tests/test_parse.py

@@ -39,12 +39,19 @@ def write_dark_frames_to_task(
     exposure_condition: ExposureConditions,
     array_shape=(2, 2, 1),
     tags: list[str] | None = None,
+    num_modstates: int = 1,
 ):
-    frame_generator = ModulatedDarkHeaders(
-        array_shape=array_shape, exposure_condition=exposure_condition
-    )
-
-    num_frames = _write_frames_to_task(task=task, frame_generator=frame_generator, extra_tags=tags)
+    num_frames = 0
+    for modstate in range(1, num_modstates + 1):
+        frame_generator = ModulatedDarkHeaders(
+            array_shape=array_shape,
+            exposure_condition=exposure_condition,
+            num_modstates=num_modstates,
+            modstate=modstate,
+        )
+        num_frames += _write_frames_to_task(
+            task=task, frame_generator=frame_generator, extra_tags=tags
+        )
 
     return num_frames
 
@@ -55,17 +62,23 @@ def write_lamp_gain_frames_to_task(
     array_shape=(2, 2, 1),
     tags: list[str] | None = None,
     tag_func: Callable[[CryonirspHeaders], list[str]] = lambda x: [],
+    num_modstates: int = 1,
 ):
-    frame_generator = ModulatedLampGainHeaders(
-        array_shape=array_shape, exposure_condition=exposure_condition
-    )
+    num_frames = 0
+    for modstate in range(1, num_modstates + 1):
+        frame_generator = ModulatedLampGainHeaders(
+            array_shape=array_shape,
+            exposure_condition=exposure_condition,
+            num_modstates=num_modstates,
+            modstate=modstate,
+        )
 
-    num_frames = _write_frames_to_task(
-        task=task,
-        frame_generator=frame_generator,
-        extra_tags=tags,
-        tag_func=tag_func,
-    )
+        num_frames += _write_frames_to_task(
+            task=task,
+            frame_generator=frame_generator,
+            extra_tags=tags,
+            tag_func=tag_func,
+        )
 
     return num_frames
 
@@ -75,12 +88,20 @@ def write_solar_gain_frames_to_task(
     exposure_condition: ExposureConditions,
     array_shape=(2, 2, 1),
     tags: list[str] | None = None,
+    num_modstates: int = 1,
 ):
-    frame_generator = ModulatedSolarGainHeaders(
-        array_shape=array_shape, exposure_condition=exposure_condition
-    )
+    num_frames = 0
+    for modstate in range(1, num_modstates + 1):
+        frame_generator = ModulatedSolarGainHeaders(
+            array_shape=array_shape,
+            exposure_condition=exposure_condition,
+            num_modstates=num_modstates,
+            modstate=modstate,
+        )
 
-    num_frames = _write_frames_to_task(task=task, frame_generator=frame_generator, extra_tags=tags)
+        num_frames += _write_frames_to_task(
+            task=task, frame_generator=frame_generator, extra_tags=tags
+        )
 
     return num_frames
 
@@ -241,13 +262,20 @@ def make_linearized_test_frames(
             task,
             exposure_condition=condition,
             tags=lin_tag,
+            num_modstates=num_modstates or 1,  # We *always* need dark frames
         )
 
     num_lamp = write_lamp_gain_frames_to_task(
-        task, tags=lin_tag, exposure_condition=lamp_exposure_condition
+        task,
+        tags=lin_tag,
+        exposure_condition=lamp_exposure_condition,
+        num_modstates=num_modstates or 1,  # We *always* need dark frames
     )
     num_solar = write_solar_gain_frames_to_task(
-        task, tags=lin_tag, exposure_condition=solar_exposure_condition
+        task,
+        tags=lin_tag,
+        exposure_condition=solar_exposure_condition,
+        num_modstates=num_modstates or 1,  # We *always* need dark frames
     )
 
     num_polcal += write_polcal_frames_to_task(
@@ -434,69 +462,81 @@ def test_parse_cryonirsp_linearized_data(parse_linearized_task, arm_id, number_o
     )
 
     task()
-
-    assert (
-        len(list(task.read(tags=[CryonirspTag.linearized(), CryonirspTag.task_dark()]))) == num_dark
-    )
-
-    assert (
-        len(
-            list(
-                parse_linearized_task.read(
-                    tags=[CryonirspTag.linearized(), CryonirspTag.task_lamp_gain()]
+    num_actual_modstates = number_of_modstates or 1
+    for modstate in range(1, num_actual_modstates + 1):
+        assert (
+            len(
+                list(
+                    task.read(
+                        tags=[
+                            CryonirspTag.linearized(),
+                            CryonirspTag.task_dark(),
+                            CryonirspTag.modstate(modstate),
+                        ]
+                    )
                 )
             )
+            == num_dark / num_actual_modstates
         )
-        == num_lamp
-    )
 
-    assert (
-        len(
-            list(
-                parse_linearized_task.read(
-                    tags=[CryonirspTag.linearized(), CryonirspTag.task_solar_gain()]
+        assert (
+            len(
+                list(
+                    task.read(
+                        tags=[
+                            CryonirspTag.linearized(),
+                            CryonirspTag.task_lamp_gain(),
+                            CryonirspTag.modstate(modstate),
+                        ]
+                    )
                 )
             )
+            == num_lamp / num_actual_modstates
         )
-        == num_solar
-    )
 
-    assert (
-        len(
-            list(
-                parse_linearized_task.read(
-                    tags=[CryonirspTag.linearized(), CryonirspTag.task_polcal()]
+        assert (
+            len(
+                list(
+                    task.read(
+                        tags=[
+                            CryonirspTag.linearized(),
+                            CryonirspTag.task_solar_gain(),
+                            CryonirspTag.modstate(modstate),
+                        ]
+                    )
                 )
             )
+            == num_solar / num_actual_modstates
         )
-        == num_polcal
-    )
 
-    assert (
-        len(
-            list(
-                parse_linearized_task.read(
-                    tags=[CryonirspTag.linearized(), CryonirspTag.task_observe()]
+        assert (
+            len(
+                list(
+                    task.read(
+                        tags=[
+                            CryonirspTag.linearized(),
+                            CryonirspTag.task_polcal(),
+                            CryonirspTag.modstate(modstate),
+                        ]
+                    )
                 )
             )
+            == num_polcal / num_actual_modstates
         )
-        == num_obs
-    )
 
-    if number_of_modstates in [0, 1]:
         assert (
             len(
                 list(
-                    parse_linearized_task.read(
+                    task.read(
                         tags=[
                             CryonirspTag.linearized(),
                             CryonirspTag.task_observe(),
-                            CryonirspTag.modstate(1),
+                            CryonirspTag.modstate(modstate),
                         ]
                     )
                 )
             )
-            == num_obs
+            == num_obs / num_actual_modstates
         )
 
 

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 0.0.61
+Version: 0.0.63
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Home-page: https://bitbucket.org/dkistdc/dkist_processing_cryonirsp/src/main/
 Author: NSO / AURA

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/dkist_processing_cryonirsp.egg-info/requires.txt

@@ -1,8 +1,8 @@
 Pillow==10.2.0
 astropy==5.3.2
-dkist-fits-specifications==4.1.1
+dkist-fits-specifications==4.2.0
 dkist-header-validator==5.1.0
-dkist-processing-common==6.2.3
+dkist-processing-common==6.2.4
 dkist-processing-math==2.0.0
 dkist-processing-pac==3.0.1
 dkist-spectral-lines==2.0.0

{dkist_processing_cryonirsp-0.0.61 → dkist_processing_cryonirsp-0.0.63}/setup.cfg

@@ -19,9 +19,9 @@ include_package_data = True
 install_requires = 
 	Pillow == 10.2.0
 	astropy == 5.3.2
-	dkist-fits-specifications == 4.1.1
+	dkist-fits-specifications == 4.2.0
 	dkist-header-validator == 5.1.0
-	dkist-processing-common == 6.2.3
+	dkist-processing-common == 6.2.4
 	dkist-processing-math == 2.0.0
 	dkist-processing-pac == 3.0.1
 	dkist-spectral-lines == 2.0.0

dkist_processing_cryonirsp-0.0.61/dkist_processing_cryonirsp/tasks/l1_output_data.py

@@ -1,22 +0,0 @@
-"""Subclasses of AssembleQualityData that cause the correct polcal metrics to build."""
-from dkist_processing_common.tasks import AssembleQualityData
-
-__all__ = ["CIAssembleQualityData", "SPAssembleQualityData"]
-
-
-class CIAssembleQualityData(AssembleQualityData):
-    """Subclass just so that the polcal_label_list can be populated."""
-
-    @property
-    def polcal_label_list(self) -> list[str]:
-        """Return label(s) for Cryo CI."""
-        return ["CI Beam 1"]
-
-
-class SPAssembleQualityData(AssembleQualityData):
-    """Subclass just so that the polcal_label_list can be populated."""
-
-    @property
-    def polcal_label_list(self) -> list[str]:
-        """Return labels for beams 1 and 2."""
-        return ["SP Beam 1", "SP Beam 2"]