fix cif test and import name for ess.diffraction

Author: nvaytet

src/ess/dream/workflow.py

@@ -64,7 +64,9 @@ def default_parameters() -> dict:
 def _collect_reducer_software() -> ReducerSoftwares:
     return ReducerSoftwares(
         [
-            Software.from_package_metadata('essdiffraction'),
+            Software.from_package_metadata('ess.diffraction'),
+            Software.from_package_metadata('ess.dream'),
+            Software.from_package_metadata('ess.powder'),
             Software.from_package_metadata('scippneutron'),
             Software.from_package_metadata('scipp'),
         ]

tests/dream/io/cif_test.py

@@ -6,10 +6,11 @@
 import pytest
 import scipp as sc
 from scippneutron.io import cif
+from scippneutron.metadata import ESS_SOURCE, Person
 
 import ess.dream.io.cif
 from ess.powder.calibration import OutputCalibrationData
-from ess.powder.types import CIFAuthors, IofTof
+from ess.powder.types import Beamline, CIFAuthors, IofTof, ReducerSoftwares, Software
 
 
 @pytest.fixture
@@ -43,14 +44,33 @@ def save_reduced_tof_to_str(cif_: cif.CIF) -> str:
 def test_save_reduced_tof(ioftof: IofTof, cal: OutputCalibrationData) -> None:
     from ess.dream import __version__
 
-    author = cif.Author(name='John Doe')
+    author = Person(name='John Doe', corresponding=True)
     cif_ = ess.dream.io.cif.prepare_reduced_tof_cif(
-        ioftof, authors=CIFAuthors([author]), calibration=cal
+        ioftof,
+        authors=CIFAuthors([author]),
+        beamline=Beamline(
+            name="DREAM",
+            facility="ESS",
+            site="ESS",
+        ),
+        source=ESS_SOURCE,
+        reducers=ReducerSoftwares(
+            [
+                Software.from_package_metadata('ess.diffraction'),
+                Software.from_package_metadata('ess.dream'),
+                Software.from_package_metadata('ess.powder'),
+                Software.from_package_metadata('scippneutron'),
+                Software.from_package_metadata('scipp'),
+            ]
+        ),
+        calibration=cal,
     )
     result = save_reduced_tof_to_str(cif_)
 
     assert "_audit_contact_author.name 'John Doe'" in result
-    assert f"_computing.diffrn_reduction 'ess.dream v{__version__}'" in result
+    assert f"_computing.diffrn_reduction\n'ess.diffraction {__version__}'" in result
+    assert f"ess.dream {__version__}" in result
+    assert f"ess.powder {__version__}" in result
     assert '_diffrn_source.beamline DREAM' in result
     assert 'ZERO 0 0.2' in result
     assert 'DIFC 1 1.2' in result