Fix tests to use new CIF interface

Author: jl-wynen

tests/dream/geant4_reduction_test.py

@@ -7,14 +7,15 @@
 import sciline
 import scipp as sc
 import scipp.testing
+from scippneutron.io.cif import Author
 
 import ess.dream.data  # noqa: F401
 from ess import dream, powder
-from ess.dream.io.cif import CIFAuthor, CIFAuthors
 from ess.powder.types import (
     AccumulatedProtonCharge,
     BackgroundRun,
     CalibrationFilename,
+    CIFAuthors,
     DspacingBins,
     Filename,
     IofDspacing,
@@ -24,7 +25,7 @@
     NeXusSample,
     NeXusSource,
     NormalizedByProtonCharge,
-    OutFilename,
+    ReducedDspacingCIF,
     SampleRun,
     TofMask,
     TwoThetaBins,
@@ -57,8 +58,8 @@
     WavelengthMask: None,
     CIFAuthors: CIFAuthors(
         [
-            CIFAuthor(
-                name="Jane Doe", email="[email protected]", id_orcid="0000-0000-0000-0001"
+            Author(
+                name="Jane Doe", email="[email protected]", orcid="0000-0000-0000-0001"
             ),
         ]
     ),
@@ -159,26 +160,19 @@ def test_use_workflow_helper(workflow):
 
 
 def test_pipeline_can_save_data(workflow):
-    def get_result(da: IofDspacing) -> IofDspacing:
-        return da
-
-    buffer = io.StringIO()
-    workflow[OutFilename] = buffer
     workflow = powder.with_pixel_mask_filenames(workflow, [])
+    result = workflow.compute(ReducedDspacingCIF)
 
-    result, expected = workflow.bind_and_call(
-        [dream.io.save_reduced_dspacing, get_result]
-    )
-    sc.testing.assert_identical(result, expected)
-
+    buffer = io.StringIO()
+    result.save(buffer)
     buffer.seek(0)
     content = buffer.read()
-    # print(content)
-    # assert False
 
     assert content.startswith(r'#\#CIF_1.1')
     _assert_contains_source_info(content)
     _assert_contains_author_info(content)
+    _assert_contains_beamline_info(content)
+    _assert_contains_dspacing_data(content)
 
 
 def _assert_contains_source_info(cif_content: str) -> None:
@@ -188,3 +182,14 @@ def _assert_contains_source_info(cif_content: str) -> None:
 def _assert_contains_author_info(cif_content: str) -> None:
     assert "audit_contact_author.name 'Jane Doe'" in cif_content
     assert 'audit_contact_author.email [email protected]' in cif_content
+
+
+def _assert_contains_beamline_info(cif_content: str) -> None:
+    assert 'diffrn_source.beamline DREAM' in cif_content
+    assert 'diffrn_source.facility ESS' in cif_content
+
+
+def _assert_contains_dspacing_data(cif_content: str) -> None:
+    assert 'pd_proc.d_spacing' in cif_content
+    assert 'pd_proc.intensity_net' in cif_content
+    assert 'pd_proc.intensity_net_su' in cif_content