dkist-processing-cryonirsp 3.1.0rc1__tar.gz → 3.2.0__tar.gz

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/CHANGELOG.rst

@@ -1,3 +1,42 @@
+v3.2.0 (2026-10-19)
+===================
+
+Removals
+--------
+
+- Remove ``CIAssembleQualityData`` and ``SPAssembleQualityData`` in favor of the common ``AssembleQualityData`` task in production, trial, and local workflows. (`#310 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/310>`__)
+
+
+Misc
+----
+
+- Write polcal quality metrics through the new common quality API. (`#310 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/310>`__)
+
+
+Documentation
+-------------
+
+- Update the README clone command to use Bitbucket's new SSH hostname. (`#313 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/313>`__)
+
+
+v3.1.1 (2026-10-14)
+===================
+
+Misc
+----
+
+- Updating dkist-processing-common to handle negative light level values. (`#312 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/312>`__)
+
+
+v3.1.0 (2026-10-09)
+===================
+
+Bugfixes
+--------
+
+- Lamp gain and CI solar gain calibrations now produce a single, correctly combined gain frame per beam even when the input spans more than one exposure condition, instead of one frame per exposure condition. (`#304 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/304>`__)
+
+
 v3.0.0 (2026-10-08)
 ===================
 

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-cryonirsp
-Version: 3.1.0rc1
+Version: 3.2.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,7 +17,7 @@ Requires-Dist: Pillow==10.4.0
 Requires-Dist: astropy==7.0.2
 Requires-Dist: dkist-fits-specifications==4.30.0
 Requires-Dist: dkist-header-validator==6.0.0
-Requires-Dist: dkist-processing-common==14.6.0
+Requires-Dist: dkist-processing-common==14.7.0
 Requires-Dist: dkist-processing-math==2.2.3
 Requires-Dist: dkist-processing-pac==3.1.2
 Requires-Dist: dkist-spectral-lines==3.0.1
@@ -71,12 +71,12 @@ Requires-Dist: PyJWT==2.15.1; extra == "frozen"
 Requires-Dist: PyYAML==6.0.3; extra == "frozen"
 Requires-Dist: PyYAML-ft==8.0.0; extra == "frozen"
 Requires-Dist: Pygments==2.21.0; extra == "frozen"
-Requires-Dist: SQLAlchemy==2.1.4; extra == "frozen"
+Requires-Dist: SQLAlchemy==2.1.5; extra == "frozen"
 Requires-Dist: Send2Trash==2.1.0; extra == "frozen"
 Requires-Dist: a2wsgi==1.10.10; extra == "frozen"
 Requires-Dist: aioftp==0.28.3; extra == "frozen"
 Requires-Dist: aiohappyeyeballs==2.7.1; extra == "frozen"
-Requires-Dist: aiohttp==3.14.4; extra == "frozen"
+Requires-Dist: aiohttp==3.14.5; extra == "frozen"
 Requires-Dist: aiosignal==1.4.0; extra == "frozen"
 Requires-Dist: aiosmtplib==5.1.3; extra == "frozen"
 Requires-Dist: aiosqlite==0.22.1; extra == "frozen"
@@ -87,13 +87,13 @@ Requires-Dist: annotated-types==0.8.0; extra == "frozen"
 Requires-Dist: anyio==4.15.1; extra == "frozen"
 Requires-Dist: apache-airflow==3.3.1; extra == "frozen"
 Requires-Dist: apache-airflow-core==3.3.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-celery==3.24.1; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-compat==1.20.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-io==1.10.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-common-sql==2.2.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-postgres==7.1.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-smtp==3.1.0; extra == "frozen"
-Requires-Dist: apache-airflow-providers-standard==1.20.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-celery==3.25.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-compat==1.22.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-io==1.10.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-common-sql==2.3.0; extra == "frozen"
+Requires-Dist: apache-airflow-providers-postgres==7.1.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-smtp==3.1.1; extra == "frozen"
+Requires-Dist: apache-airflow-providers-standard==1.20.1; extra == "frozen"
 Requires-Dist: apache-airflow-task-sdk==1.3.1; extra == "frozen"
 Requires-Dist: appnope==1.0.0; extra == "frozen"
 Requires-Dist: argcomplete==3.7.2; extra == "frozen"
@@ -105,21 +105,21 @@ Requires-Dist: asdf_standard==1.5.0; extra == "frozen"
 Requires-Dist: asgiref==3.12.1; extra == "frozen"
 Requires-Dist: asteval==1.0.10; extra == "frozen"
 Requires-Dist: astropy==7.0.2; extra == "frozen"
-Requires-Dist: astropy-iers-data==0.2026.10.5.1.0.7; extra == "frozen"
+Requires-Dist: astropy-iers-data==0.2026.10.19.0.52.1; extra == "frozen"
 Requires-Dist: asttokens==3.0.2; extra == "frozen"
-Requires-Dist: async-lru==2.3.0; extra == "frozen"
+Requires-Dist: async-lru==2.4.0; extra == "frozen"
 Requires-Dist: asyncpg==0.32.0; extra == "frozen"
 Requires-Dist: attrs==26.1.0; extra == "frozen"
 Requires-Dist: babel==2.18.0; extra == "frozen"
 Requires-Dist: beautifulsoup4==4.15.0; extra == "frozen"
 Requires-Dist: billiard==4.3.1; extra == "frozen"
 Requires-Dist: bleach==6.4.0; extra == "frozen"
-Requires-Dist: boto3==1.43.110; extra == "frozen"
-Requires-Dist: botocore==1.43.110; extra == "frozen"
-Requires-Dist: cachetools==7.2.1; extra == "frozen"
+Requires-Dist: boto3==1.43.115; extra == "frozen"
+Requires-Dist: botocore==1.43.115; extra == "frozen"
+Requires-Dist: cachetools==7.2.4; 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: certifi==2026.10.18; extra == "frozen"
 Requires-Dist: cffi==2.1.1; extra == "frozen"
 Requires-Dist: charset-normalizer==3.5.2; extra == "frozen"
 Requires-Dist: click==8.5.0; extra == "frozen"
@@ -130,7 +130,7 @@ Requires-Dist: cloudpickle==3.1.2; extra == "frozen"
 Requires-Dist: colorlog==6.12.0; extra == "frozen"
 Requires-Dist: comm==0.2.3; extra == "frozen"
 Requires-Dist: contourpy==1.4.0; extra == "frozen"
-Requires-Dist: cron_descriptor==2.1.1; extra == "frozen"
+Requires-Dist: cron_descriptor==2.2.1; extra == "frozen"
 Requires-Dist: croniter==6.2.4; extra == "frozen"
 Requires-Dist: cryptography==50.0.2; extra == "frozen"
 Requires-Dist: cycler==0.12.1; extra == "frozen"
@@ -139,9 +139,9 @@ Requires-Dist: decorator==5.3.1; extra == "frozen"
 Requires-Dist: defusedxml==0.7.1; extra == "frozen"
 Requires-Dist: dill==0.4.1; extra == "frozen"
 Requires-Dist: dkist-header-validator==6.0.0; extra == "frozen"
-Requires-Dist: dkist-processing-common==14.6.0; extra == "frozen"
+Requires-Dist: dkist-processing-common==14.7.0; extra == "frozen"
 Requires-Dist: dkist-processing-core==7.5.0; extra == "frozen"
-Requires-Dist: dkist-processing-cryonirsp==3.1.0rc1; extra == "frozen"
+Requires-Dist: dkist-processing-cryonirsp==3.2.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-service-configuration==4.3.0; extra == "frozen"
@@ -149,12 +149,12 @@ Requires-Dist: dkist-spectral-lines==3.0.1; extra == "frozen"
 Requires-Dist: dkist_fits_specifications==4.30.0; extra == "frozen"
 Requires-Dist: dnspython==2.9.0; extra == "frozen"
 Requires-Dist: email-validator==2.3.0; extra == "frozen"
-Requires-Dist: executing==2.2.1; extra == "frozen"
+Requires-Dist: executing==2.3.0; extra == "frozen"
 Requires-Dist: fastapi==0.136.3; extra == "frozen"
 Requires-Dist: fastapi-cli==0.0.32; extra == "frozen"
 Requires-Dist: fastjsonschema==2.22.2; extra == "frozen"
 Requires-Dist: flower==2.2.0; extra == "frozen"
-Requires-Dist: fonttools==4.66.1; extra == "frozen"
+Requires-Dist: fonttools==4.67.0; extra == "frozen"
 Requires-Dist: fqdn==1.6.0; extra == "frozen"
 Requires-Dist: frozenlist==1.8.0; extra == "frozen"
 Requires-Dist: fsspec==2026.9.0; extra == "frozen"
@@ -166,7 +166,7 @@ Requires-Dist: greenlet==3.5.6; extra == "frozen"
 Requires-Dist: grpcio==1.84.0; 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"
+Requires-Dist: httptools==0.9.0; extra == "frozen"
 Requires-Dist: httpx==0.28.1; extra == "frozen"
 Requires-Dist: humanize==4.16.0; extra == "frozen"
 Requires-Dist: idna==3.20; extra == "frozen"
@@ -177,11 +177,11 @@ Requires-Dist: ipython==9.17.1; 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"
-Requires-Dist: jedi==0.20.0; extra == "frozen"
+Requires-Dist: jedi==0.20.1; extra == "frozen"
 Requires-Dist: jmespath==1.1.0; extra == "frozen"
 Requires-Dist: joblib==1.6.0; extra == "frozen"
-Requires-Dist: json5==0.16.0; extra == "frozen"
-Requires-Dist: jsonpointer==3.2.0; extra == "frozen"
+Requires-Dist: json5==0.17.3; extra == "frozen"
+Requires-Dist: jsonpointer==3.4; extra == "frozen"
 Requires-Dist: jsonschema==4.26.0; extra == "frozen"
 Requires-Dist: jsonschema-specifications==2025.9.1; extra == "frozen"
 Requires-Dist: jupyter-events==0.12.1; extra == "frozen"
@@ -198,7 +198,7 @@ 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.6; extra == "frozen"
-Requires-Dist: lazy-object-proxy==1.12.0; extra == "frozen"
+Requires-Dist: lazy-object-proxy==1.13.0; extra == "frozen"
 Requires-Dist: libcst==1.9.0; extra == "frozen"
 Requires-Dist: linkify-it-py==2.2.0; extra == "frozen"
 Requires-Dist: llvmlite==0.44.0; extra == "frozen"
@@ -210,15 +210,15 @@ Requires-Dist: matplotlib==3.11.2; extra == "frozen"
 Requires-Dist: matplotlib-inline==0.2.2; extra == "frozen"
 Requires-Dist: mdurl==0.1.2; extra == "frozen"
 Requires-Dist: methodtools==0.4.7; extra == "frozen"
-Requires-Dist: mistune==3.3.4; extra == "frozen"
-Requires-Dist: more-itertools==11.1.0; extra == "frozen"
+Requires-Dist: mistune==3.4.0; extra == "frozen"
+Requires-Dist: more-itertools==11.2.1; extra == "frozen"
 Requires-Dist: moviepy==2.1.2; extra == "frozen"
 Requires-Dist: msgspec==0.22.0; extra == "frozen"
-Requires-Dist: multidict==6.9.1; extra == "frozen"
-Requires-Dist: narwhals==2.26.0; extra == "frozen"
+Requires-Dist: multidict==7.1.0; extra == "frozen"
+Requires-Dist: narwhals==2.27.1; extra == "frozen"
 Requires-Dist: natsort==8.4.0; extra == "frozen"
 Requires-Dist: nbclient==0.11.0; extra == "frozen"
-Requires-Dist: nbconvert==7.17.1; extra == "frozen"
+Requires-Dist: nbconvert==7.17.2; extra == "frozen"
 Requires-Dist: nbformat==5.11.1; extra == "frozen"
 Requires-Dist: nest-asyncio2==1.7.4; extra == "frozen"
 Requires-Dist: networkx==3.7; extra == "frozen"
@@ -261,13 +261,13 @@ Requires-Dist: parfive==2.3.1; extra == "frozen"
 Requires-Dist: parso==0.8.7; extra == "frozen"
 Requires-Dist: pathlib_abc==0.5.2; extra == "frozen"
 Requires-Dist: pathspec==1.1.1; extra == "frozen"
-Requires-Dist: pendulum==3.2.0; extra == "frozen"
+Requires-Dist: pendulum==3.3.0; extra == "frozen"
 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.12.4; extra == "frozen"
-Requires-Dist: pluggy==1.6.0; extra == "frozen"
+Requires-Dist: platformdirs==4.13.5; extra == "frozen"
+Requires-Dist: pluggy==1.7.0; extra == "frozen"
 Requires-Dist: pooch==1.9.0; extra == "frozen"
 Requires-Dist: proglog==0.1.12; extra == "frozen"
 Requires-Dist: prometheus_client==0.26.0; extra == "frozen"
@@ -281,10 +281,10 @@ Requires-Dist: psycopg2-binary==2.9.13; extra == "frozen"
 Requires-Dist: ptyprocess==0.7.0; extra == "frozen"
 Requires-Dist: pure_eval==0.2.4; extra == "frozen"
 Requires-Dist: pycparser==3.11; extra == "frozen"
-Requires-Dist: pydantic==2.14.0; extra == "frozen"
+Requires-Dist: pydantic==2.14.1; 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.50.0; extra == "frozen"
+Requires-Dist: pydantic-settings==2.16.0; extra == "frozen"
+Requires-Dist: pydantic_core==2.50.1; extra == "frozen"
 Requires-Dist: pyerfa==2.0.1.5; extra == "frozen"
 Requires-Dist: pygtrie==2.6.2; extra == "frozen"
 Requires-Dist: pyparsing==3.3.3; extra == "frozen"
@@ -306,7 +306,7 @@ Requires-Dist: rich==15.0.0; extra == "frozen"
 Requires-Dist: rich-argparse==1.8.0; extra == "frozen"
 Requires-Dist: rich-toolkit==0.20.6; extra == "frozen"
 Requires-Dist: rpds-py==2026.9.1; extra == "frozen"
-Requires-Dist: s3transfer==0.19.2; extra == "frozen"
+Requires-Dist: s3transfer==0.19.3; extra == "frozen"
 Requires-Dist: scikit-image==0.25.2; extra == "frozen"
 Requires-Dist: scikit-learn==1.9.0; extra == "frozen"
 Requires-Dist: scipy==1.15.3; extra == "frozen"
@@ -316,11 +316,11 @@ Requires-Dist: shellingham==1.5.4; extra == "frozen"
 Requires-Dist: six==1.17.0; extra == "frozen"
 Requires-Dist: sniffio==1.3.1; extra == "frozen"
 Requires-Dist: solar-wavelength-calibration==2.0.4; extra == "frozen"
-Requires-Dist: soupsieve==2.10; extra == "frozen"
+Requires-Dist: soupsieve==3.0.3; extra == "frozen"
 Requires-Dist: sqids==0.5.1; extra == "frozen"
 Requires-Dist: sqlparse==0.6.0; extra == "frozen"
 Requires-Dist: stack-data==0.6.3; extra == "frozen"
-Requires-Dist: starlette==1.7.0; extra == "frozen"
+Requires-Dist: starlette==1.9.0; extra == "frozen"
 Requires-Dist: structlog==26.1.0; extra == "frozen"
 Requires-Dist: sunpy==6.1.1; extra == "frozen"
 Requires-Dist: svcs==26.2.0; extra == "frozen"
@@ -331,7 +331,7 @@ Requires-Dist: termcolor==3.3.0; extra == "frozen"
 Requires-Dist: terminado==0.18.1; extra == "frozen"
 Requires-Dist: text-unidecode==1.3; extra == "frozen"
 Requires-Dist: threadpoolctl==3.7.0; extra == "frozen"
-Requires-Dist: tifffile==2026.9.20; extra == "frozen"
+Requires-Dist: tifffile==2026.10.15; extra == "frozen"
 Requires-Dist: tinycss2==1.5.1; extra == "frozen"
 Requires-Dist: tornado==6.5.10; extra == "frozen"
 Requires-Dist: tqdm==4.70.1; extra == "frozen"
@@ -355,9 +355,9 @@ Requires-Dist: wcwidth==0.9.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.2; extra == "frozen"
-Requires-Dist: websockets==17.2; extra == "frozen"
+Requires-Dist: websockets==17.3; extra == "frozen"
 Requires-Dist: wirerope==1.0.0; extra == "frozen"
-Requires-Dist: wrapt==2.5.0; extra == "frozen"
+Requires-Dist: wrapt==2.5.1; extra == "frozen"
 Requires-Dist: yamale==6.1.0; extra == "frozen"
 Requires-Dist: yarl==1.25.1; extra == "frozen"
 Requires-Dist: zipp==4.1.1; extra == "frozen"
@@ -491,7 +491,7 @@ Development
 -----------
 .. code-block:: bash
 
-    git clone git@bitbucket.org:dkistdc/dkist-processing-cryonirsp.git
+    git clone git@ssh.bitbucket.org:dkistdc/dkist-processing-cryonirsp.git
     cd dkist-processing-cryonirsp
     pre-commit install
     pip install -e .[test]

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/README.rst

@@ -127,7 +127,7 @@ Development
 -----------
 .. code-block:: bash
 
-    git clone git@bitbucket.org:dkistdc/dkist-processing-cryonirsp.git
+    git clone git@ssh.bitbucket.org:dkistdc/dkist-processing-cryonirsp.git
     cd dkist-processing-cryonirsp
     pre-commit install
     pip install -e .[test]

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/tasks/__init__.py

@@ -7,7 +7,6 @@ from dkist_processing_cryonirsp.tasks.ci_science import *
 from dkist_processing_cryonirsp.tasks.dark import *
 from dkist_processing_cryonirsp.tasks.gain import *
 from dkist_processing_cryonirsp.tasks.instrument_polarization import *
-from dkist_processing_cryonirsp.tasks.l1_output_data import *
 from dkist_processing_cryonirsp.tasks.linearity_correction import *
 from dkist_processing_cryonirsp.tasks.make_movie_frames import *
 from dkist_processing_cryonirsp.tasks.parse import *

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/tasks/gain.py

@@ -214,7 +214,7 @@ class GainCalibrationBase(CryonirspTaskBase):
         exposure conditions are already on a common scale and can be averaged directly, with no
         further exposure-time normalization here.
 
-        For gain types whose final output is normalized (e.g., lamp gain), the averaged array is
+        For gain types whose final output is normalized (e.g., lamp gain) the averaged array is
         then normalized to a mean of 1. For gain types that preserve their original signal scale
         (e.g., solar gain), the averaged array is returned as-is, since it's already on the
         correct counts-per-second scale.

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/tasks/instrument_polarization.py

@@ -5,7 +5,6 @@ from abc import abstractmethod
 from collections import defaultdict
 
 import numpy as np
-from astropy.io import fits
 from dkist_processing_common.codecs.fits import fits_array_encoder
 from dkist_processing_common.models.task_name import TaskName
 from dkist_processing_math.arithmetic import divide_arrays_by_array
@@ -507,7 +506,7 @@ class CIInstrumentPolarizationCalibration(InstrumentPolarizationCalibrationBase)
 
     def record_polcal_quality_metrics(self, beam: int, polcal_fitter: PolcalFitter):
         """Record various quality metrics from PolCal fits."""
-        self.quality_store_polcal_results(
+        self.quality_metrics_polcal(
             polcal_fitter=polcal_fitter,
             label=generate_polcal_quality_label(arm="CI", beam=beam),
             bin_nums=[
@@ -528,7 +527,7 @@ class SPInstrumentPolarizationCalibration(InstrumentPolarizationCalibrationBase)
         polcal_fitter: PolcalFitter,
     ) -> None:
         """Record various quality metrics from PolCal fits."""
-        self.quality_store_polcal_results(
+        self.quality_metrics_polcal(
             polcal_fitter=polcal_fitter,
             label=generate_polcal_quality_label(arm="SP", beam=beam),
             bin_nums=[
@@ -536,10 +535,6 @@ class SPInstrumentPolarizationCalibration(InstrumentPolarizationCalibrationBase)
                 self.parameters.polcal_num_spectral_bins,
             ],
             bin_labels=["spatial", "spectral"],
-            ## This is a bit of a hack and thus needs some explanation
-            # By using the ``skip_recording_constant_pars`` switch we DON'T record the "polcal constant parameters" metric
-            # for beam 2. This is because both beam 1 and beam 2 will have the same table. The way `*-common` is built
-            # it will look for all metrics for both beam 1 and beam 2 so if we did save that metric for beam 2 then the
-            # table would show up twice in the quality report. The following line avoids that.
+            # Both beams use the same constant parameters; record the table once.
             skip_recording_constant_pars=beam != 1,
         )

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/tests/local_trial_workflows/l0_to_l1.py

@@ -7,6 +7,7 @@ from pathlib import Path
 from astropy.io import fits
 from dkist_header_validator import spec214_validator
 from dkist_processing_common.manual import ManualProcessing
+from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
@@ -30,8 +31,6 @@ from dkist_processing_cryonirsp.tasks.instrument_polarization import (
 from dkist_processing_cryonirsp.tasks.instrument_polarization import (
     SPInstrumentPolarizationCalibration,
 )
-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.linearity_correction import LinearityCorrection
 from dkist_processing_cryonirsp.tasks.make_movie_frames import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks.parse import ParseL0CryonirspCILinearizedData
@@ -469,10 +468,7 @@ def main(
 
         manual_processing_run.run_task(task=QualityL1Metrics)
 
-        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=AssembleQualityData)
 
         manual_processing_run.run_task(task=ValidateL1Output)
 

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/tests/test_instrument_polarization.py

@@ -200,7 +200,7 @@ def ci_instrument_polarization_calibration_task(
 
             # Don't test place-holder QA stuff for now
             quality_metric_mocker = mocker.patch(
-                "dkist_processing_cryonirsp.tasks.instrument_polarization.CIInstrumentPolarizationCalibration.quality_store_polcal_results",
+                "dkist_processing_cryonirsp.tasks.instrument_polarization.CIInstrumentPolarizationCalibration.quality_metrics_polcal",
                 autospec=True,
             )
 
@@ -299,7 +299,7 @@ def sp_instrument_polarization_calibration_task(
 
             # Don't test place-holder QA stuff for now
             quality_metric_mocker = mocker.patch(
-                "dkist_processing_cryonirsp.tasks.instrument_polarization.SPInstrumentPolarizationCalibration.quality_store_polcal_results",
+                "dkist_processing_cryonirsp.tasks.instrument_polarization.SPInstrumentPolarizationCalibration.quality_metrics_polcal",
                 autospec=True,
             )
 

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/workflows/ci_l0_processing.py

@@ -1,5 +1,6 @@
 """Cryo CI raw data processing workflow."""
 
+from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -11,7 +12,6 @@ from dkist_processing_core import Workflow
 
 from dkist_processing_cryonirsp.tasks import AssembleCryonirspMovie
 from dkist_processing_cryonirsp.tasks import BadPixelMapCalibration
-from dkist_processing_cryonirsp.tasks import CIAssembleQualityData
 from dkist_processing_cryonirsp.tasks import CIInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import CIPolcalAsScienceCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
@@ -64,7 +64,7 @@ l0_pipeline.add_node(task=AssembleCryonirspMovie, upstreams=MakeCryonirspMovieFr
 l0_pipeline.add_node(task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspCILinearizedData)
 l0_pipeline.add_node(task=QualityL1Metrics, upstreams=CIScienceCalibration)
 l0_pipeline.add_node(
-    task=CIAssembleQualityData,
+    task=AssembleQualityData,
     upstreams=[CryonirspL0QualityMetrics, QualityL1Metrics],
 )
 
@@ -75,7 +75,7 @@ l0_pipeline.add_node(
         CIWriteL1Frame,
         CryonirspWriteL1DatasetExtras,
         AssembleCryonirspMovie,
-        CIAssembleQualityData,
+        AssembleQualityData,
     ],
 )
 l0_pipeline.add_node(
@@ -84,7 +84,7 @@ l0_pipeline.add_node(
         CIWriteL1Frame,
         CryonirspWriteL1DatasetExtras,
         AssembleCryonirspMovie,
-        CIAssembleQualityData,
+        AssembleQualityData,
     ],
 )
 l0_pipeline.add_node(

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/workflows/sp_l0_processing.py

@@ -1,5 +1,6 @@
 """Cryo SP raw data processing workflow."""
 
+from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import PublishCatalogAndQualityMessages
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import SubmitDatasetMetadata
@@ -19,7 +20,6 @@ from dkist_processing_cryonirsp.tasks import LinearityCorrection
 from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspSPLinearizedData
-from dkist_processing_cryonirsp.tasks import SPAssembleQualityData
 from dkist_processing_cryonirsp.tasks import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks import SPInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import SPPolcalAsScienceCalibration
@@ -73,7 +73,7 @@ l0_pipeline.add_node(task=AssembleCryonirspMovie, upstreams=MakeCryonirspMovieFr
 l0_pipeline.add_node(task=CryonirspL0QualityMetrics, upstreams=ParseL0CryonirspSPLinearizedData)
 l0_pipeline.add_node(task=QualityL1Metrics, upstreams=SPScienceCalibration)
 l0_pipeline.add_node(
-    task=SPAssembleQualityData,
+    task=AssembleQualityData,
     upstreams=[CryonirspL0QualityMetrics, QualityL1Metrics],
 )
 
@@ -84,7 +84,7 @@ l0_pipeline.add_node(
         SPWriteL1Frame,
         CryonirspWriteL1DatasetExtras,
         AssembleCryonirspMovie,
-        SPAssembleQualityData,
+        AssembleQualityData,
     ],
 )
 l0_pipeline.add_node(
@@ -93,7 +93,7 @@ l0_pipeline.add_node(
         SPWriteL1Frame,
         CryonirspWriteL1DatasetExtras,
         AssembleCryonirspMovie,
-        SPAssembleQualityData,
+        AssembleQualityData,
     ],
 )
 l0_pipeline.add_node(

{dkist_processing_cryonirsp-3.1.0rc1 → dkist_processing_cryonirsp-3.2.0}/dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -1,5 +1,6 @@
 """Workflows for trial runs (i.e., not Production)."""
 
+from dkist_processing_common.tasks import AssembleQualityData
 from dkist_processing_common.tasks import CreateTrialAsdf
 from dkist_processing_common.tasks import CreateTrialDatasetInventory
 from dkist_processing_common.tasks import CreateTrialQualityReport
@@ -12,7 +13,6 @@ from dkist_processing_core import Workflow
 
 from dkist_processing_cryonirsp.tasks import AssembleCryonirspMovie
 from dkist_processing_cryonirsp.tasks import BadPixelMapCalibration
-from dkist_processing_cryonirsp.tasks import CIAssembleQualityData
 from dkist_processing_cryonirsp.tasks import CIInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import CIPolcalAsScienceCalibration
 from dkist_processing_cryonirsp.tasks import CIScienceCalibration
@@ -28,7 +28,6 @@ from dkist_processing_cryonirsp.tasks import MakeCryonirspMovieFrames
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspCILinearizedData
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspRampData
 from dkist_processing_cryonirsp.tasks import ParseL0CryonirspSPLinearizedData
-from dkist_processing_cryonirsp.tasks import SPAssembleQualityData
 from dkist_processing_cryonirsp.tasks import SPGeometricCalibration
 from dkist_processing_cryonirsp.tasks import SPInstrumentPolarizationCalibration
 from dkist_processing_cryonirsp.tasks import SPPolcalAsScienceCalibration
@@ -87,14 +86,14 @@ full_trial_ci_pipeline.add_node(
 )
 full_trial_ci_pipeline.add_node(task=QualityL1Metrics, upstreams=CIScienceCalibration)
 full_trial_ci_pipeline.add_node(
-    task=CIAssembleQualityData,
+    task=AssembleQualityData,
     upstreams=[CryonirspL0QualityMetrics, QualityL1Metrics],
 )
 
 # Trial data generation
 full_trial_ci_pipeline.add_node(
     task=CreateTrialDatasetInventory,
-    upstreams=[CIWriteL1Frame, CryonirspWriteL1DatasetExtras, CIAssembleQualityData],
+    upstreams=[CIWriteL1Frame, CryonirspWriteL1DatasetExtras, AssembleQualityData],
     pip_extras=["inventory"],
 )
 full_trial_ci_pipeline.add_node(
@@ -104,7 +103,7 @@ full_trial_ci_pipeline.add_node(
 )
 full_trial_ci_pipeline.add_node(
     task=CreateTrialQualityReport,
-    upstreams=CIAssembleQualityData,
+    upstreams=AssembleQualityData,
     pip_extras=["quality", "inventory"],
 )
 
@@ -180,14 +179,14 @@ full_trial_sp_pipeline.add_node(
 )
 full_trial_sp_pipeline.add_node(task=QualityL1Metrics, upstreams=SPScienceCalibration)
 full_trial_sp_pipeline.add_node(
-    task=SPAssembleQualityData,
+    task=AssembleQualityData,
     upstreams=[CryonirspL0QualityMetrics, QualityL1Metrics],
 )
 
 # Trial data generation
 full_trial_sp_pipeline.add_node(
     task=CreateTrialDatasetInventory,
-    upstreams=[SPWriteL1Frame, CryonirspWriteL1DatasetExtras, SPAssembleQualityData],
+    upstreams=[SPWriteL1Frame, CryonirspWriteL1DatasetExtras, AssembleQualityData],
     pip_extras=["inventory"],
 )
 full_trial_sp_pipeline.add_node(
@@ -197,7 +196,7 @@ full_trial_sp_pipeline.add_node(
 )
 full_trial_sp_pipeline.add_node(
     task=CreateTrialQualityReport,
-    upstreams=SPAssembleQualityData,
+    upstreams=AssembleQualityData,
     pip_extras=["quality", "inventory"],
 )