dkist-processing-cryonirsp 1.3.4__tar.gz → 1.4.0__tar.gz

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/CHANGELOG.rst

@@ -1,3 +1,21 @@
+v1.4.0 (2024-11-14)
+===================
+
+Misc
+----
+
+- Replace `TransferCryoTrialData` with `TransferTrialData` from dkist-processing-common. (`#158 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/158>`__)
+
+
+v1.3.5 (2024-10-15)
+===================
+
+Misc
+----
+
+- Bump `dkist-processing-common` to v10.3.0 and `dkist-processing-pac` to v3.1.0, both of which harden polcal fitting against bad input data. (`#157 <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/157>`__)
+
+
 v1.3.4 (2024-10-14)
 ===================
 

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 1.3.4
+Version: 1.4.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,9 +17,9 @@ Requires-Dist: Pillow==10.3.0
 Requires-Dist: astropy==6.1.0
 Requires-Dist: dkist-fits-specifications==4.7.0
 Requires-Dist: dkist-header-validator==5.1.1
-Requires-Dist: dkist-processing-common==10.2.2
+Requires-Dist: dkist-processing-common==10.4.0
 Requires-Dist: dkist-processing-math==2.1.1
-Requires-Dist: dkist-processing-pac==3.0.3
+Requires-Dist: dkist-processing-pac==3.1.0
 Requires-Dist: dkist-spectral-lines==3.0.0
 Requires-Dist: largestinteriorrectangle==0.2.0
 Requires-Dist: dkist-service-configuration==2.2

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp/tasks/__init__.py

@@ -15,5 +15,4 @@ from dkist_processing_cryonirsp.tasks.sp_dispersion_axis_correction import *
 from dkist_processing_cryonirsp.tasks.sp_geometric import *
 from dkist_processing_cryonirsp.tasks.sp_science import *
 from dkist_processing_cryonirsp.tasks.sp_solar_gain import *
-from dkist_processing_cryonirsp.tasks.trial_output_data import *
 from dkist_processing_cryonirsp.tasks.write_l1 import *

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp/tests/local_trial_workflows/local_trial_helpers.py

@@ -9,13 +9,13 @@ import asdf
 from astropy.io import fits
 from dkist_header_validator import spec122_validator
 from dkist_processing_common.models.task_name import TaskName
+from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tasks import WorkflowTaskBase
 from dkist_processing_common.tasks.mixin.globus import GlobusTransferItem
 from dkist_service_configuration.logging import logger
 
 from dkist_processing_cryonirsp.models.tags import CryonirspTag
 from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
-from dkist_processing_cryonirsp.tasks import TransferCryoTrialData
 from dkist_processing_cryonirsp.tasks.cryonirsp_base import CryonirspTaskBase
 from dkist_processing_cryonirsp.tests.conftest import cryonirsp_testing_parameters_factory
 
@@ -550,27 +550,11 @@ def transfer_trial_data_locally_task(
     output_swtich: bool = True,
     tag_lists: list | None = None,
 ):
-    class LocalTrialData(TransferCryoTrialData):
+    class LocalTrialData(TransferTrialData):
         @property
         def destination_folder(self) -> Path:
             return Path(trial_dir)
 
-        @property
-        def debug_frame_switch(self) -> bool:
-            return debug_switch
-
-        @property
-        def intermediate_frame_switch(self) -> bool:
-            return intermediate_switch
-
-        @property
-        def output_frame_switch(self) -> bool:
-            return output_swtich
-
-        @property
-        def specific_frame_tag_lists(self) -> list:
-            return tag_lists or []
-
         def remove_folder_objects(self):
             logger.info("Would have removed folder objects here")
 

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp/tests/test_assemble_qualilty.py

@@ -232,6 +232,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
                 },
                 "bin_strs": ["bin1", "bin2"],
                 "total_bins": 100,
+                "sampled_bins": 20,
                 "num_varied_I_sys": 2,
             },
             ["QUALITY_POLCAL_LOCAL_PAR_VALS", "QUALITY_TASK_CI BEAM 1"],
@@ -240,6 +241,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
             {
                 "bin_strs": ["bin1", "bin2"],
                 "total_bins": 100,
+                "sampled_bins": 20,
                 "red_chi_list": [1, 2, 3],
                 "residual_json": dataframe_json,
             },
@@ -249,6 +251,7 @@ def quality_metrics(dataframe_json) -> list[Metric]:
             {
                 "bin_strs": ["bin1", "bin2"],
                 "total_bins": 100,
+                "sampled_bins": 20,
                 "efficiency_list": ((np.random.randn(4, 100) - 0.5) * 0.3).tolist(),
                 "warnings": ["A warning"],
             },

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp/tests/test_instrument_polarization.py

@@ -43,13 +43,14 @@ class DummyPolcalFitter(PolcalFitter):
         **fit_kwargs,
     ):
         with patch("dkist_processing_pac.fitter.polcal_fitter.FitObjects"):
-            super().__init__(
-                local_dresser=local_dresser,
-                global_dresser=global_dresser,
-                fit_mode="use_M12_I_sys_per_step",
-                init_set="OCCal_VIS",
-                _dont_fit=True,
-            )
+            with patch("dkist_processing_pac.fitter.polcal_fitter.PolcalFitter.check_dressers"):
+                super().__init__(
+                    local_dresser=local_dresser,
+                    global_dresser=global_dresser,
+                    fit_mode="use_M12_I_sys_per_step",
+                    init_set="OCCal_VIS",
+                    _dont_fit=True,
+                )
 
         self.num_modstates = local_dresser.nummod
 

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp/workflows/trial_workflows.py

@@ -4,6 +4,7 @@ from dkist_processing_common.tasks import CreateTrialDatasetInventory
 from dkist_processing_common.tasks import CreateTrialQualityReport
 from dkist_processing_common.tasks import QualityL1Metrics
 from dkist_processing_common.tasks import TransferL0Data
+from dkist_processing_common.tasks import TransferTrialData
 from dkist_processing_common.tasks import TrialTeardown
 from dkist_processing_core import ResourceQueue
 from dkist_processing_core import Workflow
@@ -33,7 +34,6 @@ from dkist_processing_cryonirsp.tasks import (
 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 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
@@ -99,7 +99,7 @@ full_trial_ci_pipeline.add_node(
 
 # Output flow
 full_trial_ci_pipeline.add_node(
-    task=TransferCryoTrialData,
+    task=TransferTrialData,
     upstreams=[
         CreateTrialDatasetInventory,
         CreateTrialAsdf,
@@ -109,7 +109,7 @@ full_trial_ci_pipeline.add_node(
 )
 
 # goodbye
-full_trial_ci_pipeline.add_node(task=TrialTeardown, upstreams=TransferCryoTrialData)
+full_trial_ci_pipeline.add_node(task=TrialTeardown, upstreams=TransferTrialData)
 
 #######################
 #######################
@@ -177,7 +177,7 @@ full_trial_sp_pipeline.add_node(
 
 # Output flow
 full_trial_sp_pipeline.add_node(
-    task=TransferCryoTrialData,
+    task=TransferTrialData,
     upstreams=[
         CreateTrialDatasetInventory,
         CreateTrialAsdf,
@@ -187,4 +187,4 @@ full_trial_sp_pipeline.add_node(
 )
 
 # goodbye
-full_trial_sp_pipeline.add_node(task=TrialTeardown, upstreams=TransferCryoTrialData)
+full_trial_sp_pipeline.add_node(task=TrialTeardown, upstreams=TransferTrialData)

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-cryonirsp
-Version: 1.3.4
+Version: 1.4.0
 Summary: Science processing code for the Cryo-NIRSP instrument on DKIST
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -17,9 +17,9 @@ Requires-Dist: Pillow==10.3.0
 Requires-Dist: astropy==6.1.0
 Requires-Dist: dkist-fits-specifications==4.7.0
 Requires-Dist: dkist-header-validator==5.1.1
-Requires-Dist: dkist-processing-common==10.2.2
+Requires-Dist: dkist-processing-common==10.4.0
 Requires-Dist: dkist-processing-math==2.1.1
-Requires-Dist: dkist-processing-pac==3.0.3
+Requires-Dist: dkist-processing-pac==3.1.0
 Requires-Dist: dkist-spectral-lines==3.0.0
 Requires-Dist: largestinteriorrectangle==0.2.0
 Requires-Dist: dkist-service-configuration==2.2

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp.egg-info/SOURCES.txt

@@ -56,7 +56,6 @@ dkist_processing_cryonirsp/tasks/sp_dispersion_axis_correction.py
 dkist_processing_cryonirsp/tasks/sp_geometric.py
 dkist_processing_cryonirsp/tasks/sp_science.py
 dkist_processing_cryonirsp/tasks/sp_solar_gain.py
-dkist_processing_cryonirsp/tasks/trial_output_data.py
 dkist_processing_cryonirsp/tasks/write_l1.py
 dkist_processing_cryonirsp/tasks/mixin/__init__.py
 dkist_processing_cryonirsp/tasks/mixin/beam_access.py
@@ -90,7 +89,6 @@ dkist_processing_cryonirsp/tests/test_sp_make_movie_frames.py
 dkist_processing_cryonirsp/tests/test_sp_science.py
 dkist_processing_cryonirsp/tests/test_sp_solar.py
 dkist_processing_cryonirsp/tests/test_trial_create_quality_report.py
-dkist_processing_cryonirsp/tests/test_trial_output_data.py
 dkist_processing_cryonirsp/tests/test_workflows.py
 dkist_processing_cryonirsp/tests/test_write_l1.py
 dkist_processing_cryonirsp/tests/local_trial_workflows/__init__.py

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/dkist_processing_cryonirsp.egg-info/requires.txt

@@ -2,9 +2,9 @@ Pillow==10.3.0
 astropy==6.1.0
 dkist-fits-specifications==4.7.0
 dkist-header-validator==5.1.1
-dkist-processing-common==10.2.2
+dkist-processing-common==10.4.0
 dkist-processing-math==2.1.1
-dkist-processing-pac==3.0.3
+dkist-processing-pac==3.1.0
 dkist-spectral-lines==3.0.0
 largestinteriorrectangle==0.2.0
 dkist-service-configuration==2.2

{dkist_processing_cryonirsp-1.3.4 → dkist_processing_cryonirsp-1.4.0}/pyproject.toml

@@ -25,9 +25,9 @@ dependencies = [
   "astropy == 6.1.0",
   "dkist-fits-specifications == 4.7.0",
   "dkist-header-validator == 5.1.1",
-  "dkist-processing-common == 10.2.2",
+  "dkist-processing-common == 10.4.0",
   "dkist-processing-math == 2.1.1",
-  "dkist-processing-pac == 3.0.3",
+  "dkist-processing-pac == 3.1.0",
   "dkist-spectral-lines == 3.0.0",
   "largestinteriorrectangle == 0.2.0",
   "dkist-service-configuration == 2.2",
@@ -105,7 +105,7 @@ show_missing = true
     directory = "changelog/"
     issue_format = "`#{issue} <https://bitbucket.org/dkistdc/dkist-processing-cryonirsp/pull-requests/{issue}>`__"
     title_format = "{version} ({project_date})"
-    ignore = [".gitempty"]
+    ignore = [".gitempty", "*.science.rst"]
 
 [[tool.towncrier.type]]
       directory = "feature"

dkist_processing_cryonirsp-1.3.4/dkist_processing_cryonirsp/tasks/trial_output_data.py

@@ -1,61 +0,0 @@
-"""Tasks for transferring scratch data to custom location for post-pipeline analysis."""
-from dkist_processing_common.models.task_name import TaskName
-from dkist_processing_common.tasks.mixin.globus import GlobusTransferItem
-from dkist_processing_common.tasks.trial_output_data import TransferTrialDataBase
-
-__all__ = ["TransferCryoTrialData"]
-
-from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
-
-
-class TransferCryoTrialData(TransferTrialDataBase):
-    """Transfer DEBUG, Intermediate, and/or output data to the trial location."""
-
-    @property
-    def intermediate_task_names(self) -> list[str]:
-        """Grab all the Calibration products used to calibrate science data."""
-        return [
-            TaskName.dark.value,
-            TaskName.lamp_gain.value,
-            TaskName.geometric_angle.value,
-            TaskName.geometric_offsets.value,
-            TaskName.geometric_spectral_shifts.value,
-            TaskName.solar_gain.value,
-            TaskName.demodulation_matrices.value,
-            CryonirspTaskName.spectral_corrected_solar_array.value,
-        ]
-
-    def build_transfer_list(self) -> list[GlobusTransferItem]:
-        """
-        Build a list containing all files we want to transfer to the trial environment.
-
-        The classes of/specific files to transfer are defined in the switches that look at the recipe run configuration.
-        """
-        transfer_list = []
-
-        if self.debug_frame_switch:
-            transfer_list += self.build_debug_frame_transfer_list()
-
-        if self.intermediate_frame_switch:
-            transfer_list += self.build_intermediate_frame_transfer_list()
-
-        if self.output_frame_switch:
-            transfer_list += self.build_output_frame_transfer_list()
-            transfer_list += self.build_output_movie_transfer_list()
-
-        if self.specific_frame_tag_lists:
-            transfer_list += self.build_transfer_list_from_tag_lists(self.specific_frame_tag_lists)
-
-        if self.output_dataset_inventory_switch:
-            transfer_list += self.build_output_dataset_inventory_transfer_list()
-
-        if self.output_asdf_switch:
-            transfer_list += self.build_output_asdf_transfer_list()
-
-        if self.output_quality_report_switch:
-            transfer_list += self.build_output_quality_report_transfer_list()
-
-        if self.output_quality_data_switch:
-            transfer_list += self.build_output_quality_data_transfer_list()
-
-        return transfer_list

dkist_processing_cryonirsp-1.3.4/dkist_processing_cryonirsp/tests/test_trial_output_data.py

@@ -1,251 +0,0 @@
-import json
-from uuid import uuid4
-
-import pytest
-from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.codecs.json import json_encoder
-from dkist_processing_common.codecs.quality import quality_data_encoder
-from dkist_processing_common.codecs.str import str_encoder
-from dkist_processing_common.models.task_name import TaskName
-from dkist_processing_common.tests.conftest import FakeGQLClient
-from pydantic import BaseModel
-
-from dkist_processing_cryonirsp.models.tags import CryonirspTag
-from dkist_processing_cryonirsp.models.task_name import CryonirspTaskName
-from dkist_processing_cryonirsp.tasks import TransferCryoTrialData
-
-
-@pytest.fixture
-def recipe_run_configuration(
-    debug_switch,
-    intermediate_switch,
-    output_switch,
-    dataset_inventory_switch,
-    asdf_switch,
-    quality_report_switch,
-    quality_data_switch,
-    tag_lists,
-):
-    """Mock Recipe Run endpoint for trial output configuration flags"""
-
-    class GQLClientWithConfiguration(FakeGQLClient):
-        def execute_gql_query(self, **kwargs):
-            response = super().execute_gql_query(**kwargs)
-            response[0].configuration = json.dumps(
-                {
-                    "trial_transfer_debug_frames": bool(debug_switch),
-                    "trial_transfer_intermediate_frames": bool(intermediate_switch),
-                    "trial_transfer_output_frames": bool(output_switch),
-                    "trial_transfer_output_dataset_inventory": bool(dataset_inventory_switch),
-                    "trial_transfer_output_asdf": bool(asdf_switch),
-                    "trial_transfer_output_quality_report": bool(quality_report_switch),
-                    "trial_transfer_output_quality_data": bool(quality_data_switch),
-                    "trial_transfer_tag_lists": tag_lists,
-                }
-            )
-            return response
-
-    return GQLClientWithConfiguration
-
-
-intermediate_task_names = [
-    TaskName.dark.value,
-    TaskName.lamp_gain.value,
-    TaskName.geometric_angle.value,
-    TaskName.geometric_offsets.value,
-    TaskName.geometric_spectral_shifts.value,
-    TaskName.solar_gain.value,
-    TaskName.demodulation_matrices.value,
-    CryonirspTaskName.spectral_corrected_solar_array.value,
-]
-
-tag_lists = [[CryonirspTag.movie()], ["FOO", "BAR"]]
-
-
-def write_debug_frames_to_task(task: TransferCryoTrialData) -> int:
-    num_debug = 3
-    for _ in range(num_debug):
-        task.write(
-            data="123", encoder=str_encoder, tags=[CryonirspTag.frame(), CryonirspTag.debug()]
-        )
-
-    return num_debug
-
-
-def write_intermediate_frames_to_task(task: TransferCryoTrialData) -> int:
-    for task_name in intermediate_task_names:
-        task.write(
-            data=task_name,
-            encoder=str_encoder,
-            tags=[CryonirspTag.frame(), CryonirspTag.intermediate(), CryonirspTag.task(task_name)],
-        )
-
-    return len(intermediate_task_names)
-
-
-def write_dummy_output_frames_to_task(task: TransferCryoTrialData) -> int:
-    num_output = 2
-    for i in range(num_output):
-        task.write(
-            data=f"output_{i}",
-            encoder=str_encoder,
-            tags=[CryonirspTag.frame(), CryonirspTag.output()],
-        )
-
-    return num_output
-
-
-def write_specific_tags_to_task(task: TransferCryoTrialData) -> int:
-    for tags in tag_lists:
-        task.write(data="foo", encoder=str_encoder, tags=tags)
-
-    return len(tag_lists)
-
-
-def write_dataset_inventory_to_task(task: TransferCryoTrialData) -> int:
-    dataset_inventory_obj: dict = {f"dsi_key": uuid4().hex}
-    task.write(
-        data=dataset_inventory_obj,
-        encoder=json_encoder,
-        tags=[CryonirspTag.output(), CryonirspTag.dataset_inventory()],
-    )
-    return 1
-
-
-def write_asdf_to_task(task: TransferCryoTrialData) -> int:
-    asdf_obj = uuid4().hex
-    task.write(
-        data=asdf_obj, encoder=str_encoder, tags=[CryonirspTag.output(), CryonirspTag.asdf()]
-    )
-    return 1
-
-
-def write_quality_report_to_task(task: TransferCryoTrialData) -> int:
-    quality_report_obj = uuid4().hex.encode("utf-8")
-    task.write(data=quality_report_obj, tags=[CryonirspTag.output(), CryonirspTag.quality_report()])
-    return 1
-
-
-def write_quality_data_to_task(task: TransferCryoTrialData) -> int:
-    quality_data_obj: list[dict] = [{f"quality_key": uuid4().hex}]
-    task.write(
-        data=quality_data_obj, encoder=quality_data_encoder, tags=CryonirspTag.quality_data()
-    )
-    return 1
-
-
-def write_unused_frames_to_task(task: TransferCryoTrialData) -> int:
-    task.write(data="bad", encoder=str_encoder, tags=["FOO"])
-    task.write(
-        data="intermediate we don't care about",
-        encoder=str_encoder,
-        tags=[CryonirspTag.frame(), CryonirspTag.intermediate(), CryonirspTag.task("NOT_A_KEEPER")],
-    )
-    return 1
-
-
-class AvailableOutputFiles(BaseModel):
-    """Number of files of each type available for potential output"""
-
-    num_debug: int
-    num_intermediate: int
-    num_output: int
-    num_specific: int
-    num_dataset_inventory: int
-    num_asdf: int
-    num_quality_report: int
-    num_quality_data: int
-
-
-@pytest.fixture
-def transfer_task_with_files(recipe_run_id, recipe_run_configuration, tmp_path, mocker):
-    mocker.patch(
-        "dkist_processing_common.tasks.mixin.metadata_store.GraphQLClient",
-        new=recipe_run_configuration,
-    )
-    proposal_id = "test_proposal_id"
-    with TransferCryoTrialData(
-        recipe_run_id=recipe_run_id,
-        workflow_name="workflow_name",
-        workflow_version="workflow_version",
-    ) as task:
-        task.scratch = WorkflowFileSystem(
-            recipe_run_id=recipe_run_id,
-            scratch_base_path=tmp_path,
-        )
-        task.constants._update({"PROPOSAL_ID": proposal_id})
-        try:
-            write_unused_frames_to_task(task)
-            available_output_files = AvailableOutputFiles(
-                num_debug=write_debug_frames_to_task(task),
-                num_intermediate=write_intermediate_frames_to_task(task),
-                num_output=write_dummy_output_frames_to_task(task),
-                num_specific=write_specific_tags_to_task(task),
-                num_dataset_inventory=write_dataset_inventory_to_task(task),
-                num_asdf=write_asdf_to_task(task),
-                num_quality_report=write_quality_report_to_task(task),
-                num_quality_data=write_quality_data_to_task(task),
-            )
-            yield task, available_output_files
-
-        finally:
-            task._purge()
-
-
-@pytest.mark.parametrize(
-    "debug_switch, intermediate_switch, output_switch, dataset_inventory_switch, asdf_switch, quality_report_switch, quality_data_switch, tag_lists",
-    [
-        pytest.param(0, 0, 0, 0, 0, 0, 0, [], id="none"),
-        pytest.param(1, 0, 0, 0, 0, 0, 0, [], id="debug_only"),
-        pytest.param(0, 1, 0, 0, 0, 0, 0, [], id="intermediate_only"),
-        pytest.param(0, 0, 1, 0, 0, 0, 0, [], id="output_only"),
-        pytest.param(0, 0, 0, 1, 0, 0, 0, [], id="dataset_inventory_only"),
-        pytest.param(0, 0, 0, 0, 1, 0, 0, [], id="asdf_only"),
-        pytest.param(0, 0, 0, 0, 0, 1, 0, [], id="quality_report_only"),
-        pytest.param(0, 0, 0, 0, 0, 0, 1, [], id="quality_data_only"),
-        pytest.param(0, 0, 0, 0, 0, 0, 0, tag_lists, id="specific_only"),
-        pytest.param(1, 1, 1, 1, 1, 1, 1, tag_lists, id="all"),
-        pytest.param(1, 1, 0, 0, 0, 0, 0, tag_lists, id="combo_debug_intermediate_specific"),
-        pytest.param(1, 1, 1, 0, 0, 0, 0, [], id="combo_debug_intermediate_output"),
-        pytest.param(0, 1, 1, 0, 0, 0, 0, tag_lists, id="combo_intermediate_output_specific"),
-        pytest.param(1, 0, 1, 0, 0, 0, 0, tag_lists, id="combo_debug_output_specific"),
-    ],
-)
-def test_build_transfer_list(
-    transfer_task_with_files,
-    debug_switch,
-    intermediate_switch,
-    output_switch,
-    dataset_inventory_switch,
-    asdf_switch,
-    quality_report_switch,
-    quality_data_switch,
-    tag_lists,
-):
-    """
-    Given: A TransferCryoTrialData task with a recipe run configuration (RRC) and a collection of frames
-    When: Building the transfer list
-    Then: Only the files requested by the RRC switches are collected for transfer
-    """
-    task, available_output_files = transfer_task_with_files
-
-    expected_num = 0
-    if debug_switch:
-        expected_num += available_output_files.num_debug
-    if intermediate_switch:
-        expected_num += available_output_files.num_intermediate
-    if output_switch:
-        expected_num += available_output_files.num_output
-    if dataset_inventory_switch:
-        expected_num += available_output_files.num_dataset_inventory
-    if asdf_switch:
-        expected_num += available_output_files.num_asdf
-    if quality_report_switch:
-        expected_num += available_output_files.num_quality_report
-    if quality_data_switch:
-        expected_num += available_output_files.num_quality_data
-    if tag_lists:
-        expected_num += available_output_files.num_specific
-
-    transfer_list = task.build_transfer_list()
-    assert len(transfer_list) == expected_num