dkist-processing-cryonirsp 0.0.77rc1__tar.gz → 0.0.78__tar.gz

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/CHANGELOG.rst

@@ -1,3 +1,26 @@
+v0.0.78 (2024-08-09)
+====================
+
+Misc
+----
+
+- Make parsing of some header keys arm specific. (`#142 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/142>`__)
+
+
+v0.0.77 (2024-08-07)
+====================
+
+Features
+--------
+
+- Add calibration task to compute accurate header values for
+  CTYPE1, CUNIT1, CRPIX1, PV1_0, PV1_1, PV1_2, CRVAL1, CDELT1, PV1_2,
+  CTYPE1A, CUNIT1A, CRPIX1A, PV1_0A, PV1_1A, PV1_2A, CRVAL1A, CDELT1A, PV1_2A.
+
+  This is done by shifting the raw wavelength value (CRVAL1/A) to align with the FTS atlas, and
+  then fitting a model to infer and correct the values of the aforementioned headers. (`#110 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/110>`__)
+
+
 v0.0.76 (2024-08-05)
 ====================
 

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist_processing_cryonirsp
-Version: 0.0.77rc1
+Version: 0.0.78
 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.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp/tasks/parse.py

@@ -49,7 +49,12 @@ from dkist_processing_cryonirsp.parsers.time import CryonirspTimeObsBud
 from dkist_processing_cryonirsp.parsers.wavelength import ObserveWavelengthBud
 
 
-__all__ = ["ParseL0CryonirspRampData", "ParseL0CryonirspLinearizedData"]
+__all__ = [
+    "ParseL0CryonirspRampData",
+    "ParseL0CryonirspLinearizedData",
+    "ParseL0CryonirspCILinearizedData",
+    "ParseL0CryonirspSPLinearizedData",
+]
 S = TypeVar("S", bound=Stem)
 
 
@@ -174,18 +179,6 @@ class ParseL0CryonirspLinearizedData(ParseDataBase, InputDatasetMixin):
             NumberOfMeasurementsBud(),
             CryonirspSolarGainStartTimeBud(),
             NumCSStepBud(self.parameters.max_cs_step_time_sec),
-            TaskUniqueBud(
-                constant_name=CryonirspBudName.wave_min.value,
-                metadata_key="wave_min",
-                ip_task_type=TaskName.solar_gain.value,
-                task_type_parsing_function=parse_header_ip_task_with_gains,
-            ),
-            TaskUniqueBud(
-                constant_name=CryonirspBudName.wave_max.value,
-                metadata_key="wave_max",
-                ip_task_type=TaskName.solar_gain.value,
-                task_type_parsing_function=parse_header_ip_task_with_gains,
-            ),
             CryonirspTaskExposureConditionsBud(
                 stem_name=CryonirspBudName.dark_frame_exposure_conditions_list.value,
                 ip_task_type=TaskName.dark.value,
@@ -219,6 +212,33 @@ class ParseL0CryonirspLinearizedData(ParseDataBase, InputDatasetMixin):
                 constant_name=CryonirspBudName.modulator_spin_mode.value,
                 metadata_key="modulator_spin_mode",
             ),
+        ]
+
+    @property
+    def tag_flowers(self) -> list[S]:
+        """Add CryoNIRSP specific tags to common tags."""
+        return default_tag_flower_factory() + [
+            TaskTypeFlower(header_task_parsing_func=parse_header_ip_task_with_gains),
+            PolcalTaskFlower(),
+            MapScanFlower(),
+            ModstateNumberFlower(),
+            CSStepFlower(max_cs_step_time_sec=self.parameters.max_cs_step_time_sec),
+            ScanStepNumberFlower(),
+            MeasurementNumberFlower(),
+            SingleValueSingleKeyFlower(
+                tag_stem_name=CryonirspStemName.exposure_conditions.value,
+                metadata_key="exposure_conditions",
+            ),
+        ]
+
+
+class ParseL0CryonirspSPLinearizedData(ParseL0CryonirspLinearizedData):
+    """Parse linearity corrected CryoNIRSP-SP input data with SP arm specific constants."""
+
+    @property
+    def constant_buds(self) -> list[S]:
+        """Add CryoNIRSP-SP specific constants to common constants."""
+        return super().constant_buds + [
             TaskUniqueBud(
                 constant_name=CryonirspBudName.grating_position_deg.value,
                 metadata_key="grating_position_deg",
@@ -237,21 +257,22 @@ class ParseL0CryonirspLinearizedData(ParseDataBase, InputDatasetMixin):
                 ip_task_type=TaskName.solar_gain.value,
                 task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
-        ]
-
-    @property
-    def tag_flowers(self) -> list[S]:
-        """Add CryoNIRSP specific tags to common tags."""
-        return default_tag_flower_factory() + [
-            TaskTypeFlower(header_task_parsing_func=parse_header_ip_task_with_gains),
-            PolcalTaskFlower(),
-            MapScanFlower(),
-            ModstateNumberFlower(),
-            CSStepFlower(max_cs_step_time_sec=self.parameters.max_cs_step_time_sec),
-            ScanStepNumberFlower(),
-            MeasurementNumberFlower(),
-            SingleValueSingleKeyFlower(
-                tag_stem_name=CryonirspStemName.exposure_conditions.value,
-                metadata_key="exposure_conditions",
+            TaskUniqueBud(
+                constant_name=CryonirspBudName.wave_min.value,
+                metadata_key="wave_min",
+                ip_task_type=TaskName.solar_gain.value,
+                task_type_parsing_function=parse_header_ip_task_with_gains,
+            ),
+            TaskUniqueBud(
+                constant_name=CryonirspBudName.wave_max.value,
+                metadata_key="wave_max",
+                ip_task_type=TaskName.solar_gain.value,
+                task_type_parsing_function=parse_header_ip_task_with_gains,
             ),
         ]
+
+
+class ParseL0CryonirspCILinearizedData(ParseL0CryonirspLinearizedData):
+    """Parse linearity corrected CryoNIRSP-CI input data with CI arm specific constants."""
+
+    pass

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp/tests/test_parse.py

@@ -19,8 +19,9 @@ from dkist_processing_cryonirsp.models.exposure_conditions import ExposureCondit
 from dkist_processing_cryonirsp.models.parameters import CryonirspParsingParameters
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.parsers.polarimetric_check import PolarimetricCheckingUniqueBud
-from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspLinearizedData
+from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspCILinearizedData
 from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspRampData
+from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedData
 from dkist_processing_cryonirsp.tests.conftest import _write_frames_to_task
 from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 from dkist_processing_cryonirsp.tests.header_models import CryonirspHeaders
@@ -326,11 +327,17 @@ def make_non_linearized_test_frames(
 
 
 @pytest.fixture
-def parse_linearized_task(tmp_path, recipe_run_id, assign_input_dataset_doc_to_task, mocker):
+def parse_linearized_task(
+    tmp_path, recipe_run_id, assign_input_dataset_doc_to_task, mocker, arm_id
+):
     mocker.patch(
         "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
     )
-    with ParseL0CryonirspLinearizedData(
+    if arm_id == "CI":
+        parsing_class = ParseL0CryonirspCILinearizedData
+    if arm_id == "SP":
+        parsing_class = ParseL0CryonirspSPLinearizedData
+    with parsing_class(
         recipe_run_id=recipe_run_id,
         workflow_name="parse_cryonirsp_input_data",
         workflow_version="VX.Y",
@@ -1233,6 +1240,7 @@ def test_parse_cryonirsp_linearized_data_constants(
     assert task.constants._db_dict["VARIANCE_CADENCE"] == 0
 
 
+@pytest.mark.parametrize("arm_id", ["SP"])
 def test_parse_cryonirsp_linearized_data_internal_scan_loops_as_map_scan_and_scan_step(
     parse_linearized_task,
 ):

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp/workflows/ci_l0_processing.py

@@ -23,9 +23,9 @@ from dkist_processing_cryonirsp.tasks import DarkCalibration
 from dkist_processing_cryonirsp.tasks import LampGainCalibration
 from dkist_processing_cryonirsp.tasks import LinearityCorrection
 from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
-from dkist_processing_cryonirsp.tasks import ParseL0CryonirspLinearizedData
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks.l1_output_data import CIAssembleQualityData
+from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspCILinearizedData
 
 l0_pipeline = Workflow(
     category="cryonirsp",
@@ -41,9 +41,9 @@ l0_pipeline.add_node(
     resource_queue=ResourceQueue.HIGH_MEMORY,
     upstreams=ParseL0CryonirspRampData,
 )
-l0_pipeline.add_node(task=ParseL0CryonirspLinearizedData, upstreams=LinearityCorrection)
-l0_pipeline.add_node(task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspLinearizedData)
-l0_pipeline.add_node(task=BadPixelMapCalibration, upstreams=ParseL0CryonirspLinearizedData)
+l0_pipeline.add_node(task=ParseL0CryonirspCILinearizedData, upstreams=LinearityCorrection)
+l0_pipeline.add_node(task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspCILinearizedData)
+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)

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp/workflows/sp_l0_processing.py

@@ -16,7 +16,6 @@ from dkist_processing_cryonirsp.tasks import DarkCalibration
 from dkist_processing_cryonirsp.tasks import LampGainCalibration
 from dkist_processing_cryonirsp.tasks import LinearityCorrection
 from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
-from dkist_processing_cryonirsp.tasks import ParseL0CryonirspLinearizedData
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import SPBeamBoundariesCalibration
 from dkist_processing_cryonirsp.tasks import SPDispersionAxisCorrection
@@ -28,6 +27,7 @@ from dkist_processing_cryonirsp.tasks import SPScienceCalibration
 from dkist_processing_cryonirsp.tasks import SPSolarGainCalibration
 from dkist_processing_cryonirsp.tasks import SPWriteL1Frame
 from dkist_processing_cryonirsp.tasks.l1_output_data import SPAssembleQualityData
+from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedData
 
 l0_pipeline = Workflow(
     category="cryonirsp",
@@ -43,9 +43,9 @@ l0_pipeline.add_node(
     resource_queue=ResourceQueue.HIGH_MEMORY,
     upstreams=ParseL0CryonirspRampData,
 )
-l0_pipeline.add_node(task=ParseL0CryonirspLinearizedData, upstreams=LinearityCorrection)
-l0_pipeline.add_node(task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspLinearizedData)
-l0_pipeline.add_node(task=BadPixelMapCalibration, upstreams=ParseL0CryonirspLinearizedData)
+l0_pipeline.add_node(task=ParseL0CryonirspSPLinearizedData, upstreams=LinearityCorrection)
+l0_pipeline.add_node(task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspSPLinearizedData)
+l0_pipeline.add_node(task=BadPixelMapCalibration, upstreams=ParseL0CryonirspSPLinearizedData)
 l0_pipeline.add_node(task=SPBeamBoundariesCalibration, upstreams=BadPixelMapCalibration)
 l0_pipeline.add_node(task=DarkCalibration, upstreams=SPBeamBoundariesCalibration)
 l0_pipeline.add_node(task=LampGainCalibration, upstreams=DarkCalibration)

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -23,7 +23,6 @@ from dkist_processing_cryonirsp.tasks import DarkCalibration
 from dkist_processing_cryonirsp.tasks import LampGainCalibration
 from dkist_processing_cryonirsp.tasks import LinearityCorrection
 from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
-from dkist_processing_cryonirsp.tasks import ParseL0CryonirspLinearizedData
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import SPBeamBoundariesCalibration
 from dkist_processing_cryonirsp.tasks import SPDispersionAxisCorrection
@@ -37,6 +36,8 @@ from dkist_processing_cryonirsp.tasks import SPWriteL1Frame
 from dkist_processing_cryonirsp.tasks import TransferCryoTrialData
 from dkist_processing_cryonirsp.tasks.l1_output_data import CIAssembleQualityData
 from dkist_processing_cryonirsp.tasks.l1_output_data import SPAssembleQualityData
+from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspCILinearizedData
+from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspSPLinearizedData
 
 full_trial_ci_pipeline = Workflow(
     category="cryonirsp",
@@ -52,12 +53,14 @@ full_trial_ci_pipeline.add_node(
     resource_queue=ResourceQueue.HIGH_MEMORY,
     upstreams=ParseL0CryonirspRampData,
 )
-full_trial_ci_pipeline.add_node(task=ParseL0CryonirspLinearizedData, upstreams=LinearityCorrection)
 full_trial_ci_pipeline.add_node(
-    task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspLinearizedData
+    task=ParseL0CryonirspCILinearizedData, upstreams=LinearityCorrection
 )
 full_trial_ci_pipeline.add_node(
-    task=BadPixelMapCalibration, upstreams=ParseL0CryonirspLinearizedData
+    task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspCILinearizedData
+)
+full_trial_ci_pipeline.add_node(
+    task=BadPixelMapCalibration, upstreams=ParseL0CryonirspCILinearizedData
 )
 full_trial_ci_pipeline.add_node(task=CIBeamBoundariesCalibration, upstreams=BadPixelMapCalibration)
 full_trial_ci_pipeline.add_node(task=DarkCalibration, upstreams=CIBeamBoundariesCalibration)
@@ -110,12 +113,14 @@ full_trial_sp_pipeline.add_node(
     resource_queue=ResourceQueue.HIGH_MEMORY,
     upstreams=ParseL0CryonirspRampData,
 )
-full_trial_sp_pipeline.add_node(task=ParseL0CryonirspLinearizedData, upstreams=LinearityCorrection)
 full_trial_sp_pipeline.add_node(
-    task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspLinearizedData
+    task=ParseL0CryonirspSPLinearizedData, upstreams=LinearityCorrection
+)
+full_trial_sp_pipeline.add_node(
+    task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspSPLinearizedData
 )
 full_trial_sp_pipeline.add_node(
-    task=BadPixelMapCalibration, upstreams=ParseL0CryonirspLinearizedData
+    task=BadPixelMapCalibration, upstreams=ParseL0CryonirspSPLinearizedData
 )
 full_trial_sp_pipeline.add_node(task=SPBeamBoundariesCalibration, upstreams=BadPixelMapCalibration)
 full_trial_sp_pipeline.add_node(task=DarkCalibration, upstreams=SPBeamBoundariesCalibration)

{dkist_processing_cryonirsp-0.0.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 0.0.77rc1
+Version: 0.0.78
 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.77rc1 → dkist_processing_cryonirsp-0.0.78}/dkist_processing_cryonirsp.egg-info/SOURCES.txt

@@ -12,7 +12,6 @@ setup.cfg
 setup.py
 towncrier_science.toml
 changelog/.gitempty
-changelog/110.feature.rst
 dkist_processing_cryonirsp/__init__.py
 dkist_processing_cryonirsp/config.py
 dkist_processing_cryonirsp.egg-info/PKG-INFO

dkist_processing_cryonirsp-0.0.77rc1/changelog/110.feature.rst

@@ -1,6 +0,0 @@
-Add calibration task to compute accurate header values for
-CTYPE1, CUNIT1, CRPIX1, PV1_0, PV1_1, PV1_2, CRVAL1, CDELT1, PV1_2,
-CTYPE1A, CUNIT1A, CRPIX1A, PV1_0A, PV1_1A, PV1_2A, CRVAL1A, CDELT1A, PV1_2A.
-
-This is done by shifting the raw wavelength value (CRVAL1/A) to align with the FTS atlas, and
-then fitting a model to infer and correct the values of the aforementioned headers.