dkist-processing-visp 2.20.14__py3-none-any.whl → 5.1.1__py3-none-any.whl

dkist_processing_visp/tests/test_write_l1.py

@@ -4,9 +4,9 @@ from astropy.io import fits
 from astropy.time import Time
 from dkist_fits_specifications import __version__ as spec_version
 from dkist_header_validator import spec214_validator
+from dkist_processing_common.models.fits_access import MetadataKey
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.models.wavelength import WavelengthRange
-from dkist_processing_common.tests.conftest import FakeGQLClient
 from dkist_spectral_lines import get_closest_spectral_line
 from dkist_spectral_lines import get_spectral_lines
 
@@ -40,6 +40,7 @@ def write_l1_task(
         NUM_RASTER_STEPS=2,
         SPECTRAL_LINE="VISP Ca II H",
         POLARIMETER_MODE=pol_mode,
+        NUM_MODSTATES=1 if pol_mode == "observe_intensity" else 10,
     )
     init_visp_constants_db(recipe_run_id, constants_db)
     with VispWriteL1Frame(
@@ -68,7 +69,13 @@ def mocked_get_wavelength_range(wavelength_range):
 
 @pytest.mark.parametrize("pol_mode", ["observe_polarimetric", "observe_intensity"])
 def test_write_l1_frame(
-    write_l1_task, wcs_axis_names, pol_mode, wavelength_range, mocked_get_wavelength_range, mocker
+    write_l1_task,
+    wcs_axis_names,
+    pol_mode,
+    wavelength_range,
+    mocked_get_wavelength_range,
+    mocker,
+    fake_gql_client,
 ):
     """
     :Given: a write L1 task
@@ -76,7 +83,7 @@ def test_write_l1_frame(
     :Then: no errors are raised
     """
     mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=FakeGQLClient
+        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient", new=fake_gql_client
     )
     mocker.patch(
         "dkist_processing_visp.tasks.write_l1.VispWriteL1Frame.get_wavelength_range",
@@ -156,9 +163,21 @@ def test_write_l1_frame(
             assert header["EXPRID02"] == "EXPERID2"
             assert header["EXPRID03"] == "EXPERID3"
             assert header["WAVEBAND"] == expected_waveband
+            assert header["BUNIT"] == ""
+            assert (
+                header.comments["BUNIT"]
+                == "Values are relative to disk center. See calibration docs."
+            )
             for i, line in enumerate(expected_spectral_lines, start=1):
                 assert header[f"SPECLN{i:02}"] == line.name
 
             with pytest.raises(KeyError):
                 # Make sure no more lines were added
                 header[f"SPECLN{i+1:02}"]
+
+            if pol_mode == "observe_polarimetric":
+                assert header["CADENCE"] == 100
+                assert header[MetadataKey.fpa_exposure_time_ms] == 150
+            else:
+                assert header["CADENCE"] == 10
+                assert header[MetadataKey.fpa_exposure_time_ms] == 15

dkist_processing_visp/workflows/__init__.py

@@ -1,2 +1,3 @@
 """Workflow package."""
+
 from dkist_processing_visp.config import dkist_processing_visp_configurations

dkist_processing_visp/workflows/l0_processing.py

@@ -1,4 +1,5 @@
 """ViSP raw data processing workflow."""
+
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -40,8 +41,13 @@ l0_pipeline.add_node(
     task=SolarCalibration,
     upstreams=[LampCalibration, GeometricCalibration, BackgroundLightCalibration],
 )
-l0_pipeline.add_node(task=InstrumentPolarizationCalibration, upstreams=SolarCalibration)
-l0_pipeline.add_node(task=ScienceCalibration, upstreams=InstrumentPolarizationCalibration)
+l0_pipeline.add_node(
+    task=InstrumentPolarizationCalibration,
+    upstreams=[BackgroundLightCalibration, GeometricCalibration],
+)
+l0_pipeline.add_node(
+    task=ScienceCalibration, upstreams=[SolarCalibration, InstrumentPolarizationCalibration]
+)
 l0_pipeline.add_node(task=VispWriteL1Frame, upstreams=ScienceCalibration)
 
 # Movie flow
@@ -60,7 +66,8 @@ l0_pipeline.add_node(
 # Output flow
 l0_pipeline.add_node(task=TransferL1Data, upstreams=[VispWriteL1Frame, AssembleVispMovie])
 l0_pipeline.add_node(
-    task=SubmitDatasetMetadata, upstreams=[VispWriteL1Frame, VispAssembleQualityData]
+    task=SubmitDatasetMetadata,
+    upstreams=[VispWriteL1Frame, VispAssembleQualityData, AssembleVispMovie],
 )
 l0_pipeline.add_node(
     task=PublishCatalogAndQualityMessages, upstreams=[SubmitDatasetMetadata, TransferL1Data]

dkist_processing_visp/workflows/trial_workflows.py

@@ -1,4 +1,5 @@
 """Workflows for trial runs (i.e., not Production)."""
+
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialDatasetInventory
 from dkist_processing_common.tasks import CreateTrialQualityReport
@@ -42,8 +43,13 @@ full_trial_pipeline.add_node(
     task=SolarCalibration,
     upstreams=[LampCalibration, GeometricCalibration, BackgroundLightCalibration],
 )
-full_trial_pipeline.add_node(task=InstrumentPolarizationCalibration, upstreams=SolarCalibration)
-full_trial_pipeline.add_node(task=ScienceCalibration, upstreams=InstrumentPolarizationCalibration)
+full_trial_pipeline.add_node(
+    task=InstrumentPolarizationCalibration,
+    upstreams=[BackgroundLightCalibration, GeometricCalibration],
+)
+full_trial_pipeline.add_node(
+    task=ScienceCalibration, upstreams=[SolarCalibration, InstrumentPolarizationCalibration]
+)
 full_trial_pipeline.add_node(task=VispWriteL1Frame, upstreams=ScienceCalibration)
 
 # Movie flow