diff --git a/src/haven/instrument/dxp.py b/src/haven/instrument/dxp.py index 063f8ccb..a9c89502 100644 --- a/src/haven/instrument/dxp.py +++ b/src/haven/instrument/dxp.py @@ -439,7 +439,7 @@ async def make_dxp_device(device_name, prefix, num_elements): Cls, prefix=f"{prefix}:", name=device_name, - labels={"xrf_detectors", "fluorescence_detectors"}, + labels={"xrf_detectors", "fluorescence_detectors", "detectors"}, ) diff --git a/src/haven/instrument/xspress.py b/src/haven/instrument/xspress.py index 48a8a8b9..3dea0ca2 100644 --- a/src/haven/instrument/xspress.py +++ b/src/haven/instrument/xspress.py @@ -576,7 +576,7 @@ async def make_xspress_device(name, prefix, num_elements): Cls, name=name, prefix=f"{prefix}:", - labels={"xrf_detectors", "fluorescence_detectors"}, + labels={"xrf_detectors", "fluorescence_detectors", "detectors"}, ) diff --git a/tests/conftest.py b/tests/conftest.py index f17e90e3..dbe9bd6a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -334,7 +334,7 @@ class DxpVortex(DxpDetector): @pytest.fixture() def dxp(sim_registry): FakeDXP = make_fake_device(DxpVortex) - vortex = FakeDXP(name="vortex_me4", labels={"xrf_detectors"}) + vortex = FakeDXP(name="vortex_me4", labels={"xrf_detectors", "detectors"}) sim_registry.register(vortex) # vortex.net_cdf.dimensions.set([1477326, 1, 1]) yield vortex diff --git a/tests/test_detector_list.py b/tests/test_detector_list.py index a132adc6..f604dc62 100644 --- a/tests/test_detector_list.py +++ b/tests/test_detector_list.py @@ -3,13 +3,13 @@ from firefly.detector_list import DetectorListView -def test_detector_model(ffapp, sim_registry, sim_vortex): +def test_detector_model(ffapp, dxp): view = DetectorListView() assert hasattr(view, "detector_model") assert view.detector_model.item(0).text() == "vortex_me4" -def test_selected_detectors(ffapp, sim_vortex, qtbot): +def test_selected_detectors(ffapp, dxp, qtbot): """Do we get the list of detectors after they have been selected?""" # No detectors selected, so empty list view = DetectorListView()