From 78f0504c125c20cd70edb797c041a9ddc5f39190 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Wed, 28 Jun 2023 13:19:10 +0100 Subject: [PATCH 1/6] update dodal url --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ca37f1505..a1141de1c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,7 +36,7 @@ install_requires = xarray doct databroker - dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@ee7e7b80aab7c43d4027e9001b4935a269553cff + dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@b49b2dffa27e44eebf42e8c7e35a375da42654cd [options.extras_require] From 36a748ff6867bf583335e10f98a8b5976a1604d0 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Wed, 28 Jun 2023 13:49:01 +0100 Subject: [PATCH 2/6] Fix test_create_devices --- src/artemis/experiment_plans/tests/test_grid_detection_plan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/artemis/experiment_plans/tests/test_grid_detection_plan.py b/src/artemis/experiment_plans/tests/test_grid_detection_plan.py index 3799a39d5..b14463f0b 100644 --- a/src/artemis/experiment_plans/tests/test_grid_detection_plan.py +++ b/src/artemis/experiment_plans/tests/test_grid_detection_plan.py @@ -128,7 +128,7 @@ def test_create_devices(create_device: MagicMock): create_device.assert_has_calls( [ call(Smargon, "smargon", "-MO-SGON-01:", True, False), - call(OAV, "oav", "-DI-OAV-01:", True, False), + call(OAV, "oav", "", True, False), call( device=Backlight, name="backlight", From 0e4fe95344efd3ad0841bb12b39d483b55496f38 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Wed, 21 Jun 2023 10:51:01 +0100 Subject: [PATCH 3/6] Added unit test to check arming runs --- .../tests/test_fast_grid_scan_plan.py | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py b/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py index 0e6a78612..80384370d 100644 --- a/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py +++ b/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py @@ -355,6 +355,8 @@ def test_when_exception_occurs_during_running_then_eiger_disarmed( fake_fgs_composite.eiger.filewriters_finished.set_finished() fake_fgs_composite.eiger.odin.check_odin_state = MagicMock(return_value=True) fake_fgs_composite.eiger.odin.file_writer.num_captured.sim_put(1200) + fake_fgs_composite.eiger.filewriters_finished = Status() + fake_fgs_composite.eiger.filewriters_finished.set_finished() fake_fgs_composite.eiger.stage = MagicMock( return_value=Status(None, None, 0, True, True) @@ -372,3 +374,31 @@ def test_when_exception_occurs_during_running_then_eiger_disarmed( ) fake_fgs_composite.eiger.disarm_detector.assert_called_once() + + +# Eiger is armed if eiger.armed_status is complete and fan ready is called. This test is very slow - could mocking more functions could speed it up +def test_fgs_arms_eiger_without_grid_detect( + fake_fgs_composite: FGSComposite, + test_fgs_params: FGSInternalParameters, + mock_subscriptions: FGSCallbackCollection, + RE: RunEngine, +): + def get_good_status(): + status = Status() + status.set_finished() + return status + + fake_fgs_composite.eiger.odin.check_odin_state = MagicMock(return_value=True) + fake_fgs_composite.eiger.odin.check_odin_initialised = MagicMock( + return_value=[True, True] + ) + fake_fgs_composite.eiger.set_odin_pvs = MagicMock(return_value=get_good_status()) + fake_fgs_composite.eiger.stale_params.sim_put(0) + fake_fgs_composite.eiger._wait_fan_ready = MagicMock(return_value=get_good_status()) + fake_fgs_composite.eiger._wait_for_odin_status = MagicMock( + return_value=get_good_status() + ) + + RE(bps.stage(fake_fgs_composite.eiger)) + fake_fgs_composite.eiger.arming_status.wait(60) + fake_fgs_composite.eiger._wait_fan_ready.assert_called_once() From 5a670b71ff10930ef86e8ab46644521178a08265 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Wed, 21 Jun 2023 10:55:10 +0100 Subject: [PATCH 4/6] update dodal url --- setup.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index a1141de1c..fb3351fe4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,8 +36,7 @@ install_requires = xarray doct databroker - dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@b49b2dffa27e44eebf42e8c7e35a375da42654cd - + dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@c6f0e617b0675323b4ea2bddfd9652700dc767ce [options.extras_require] dev = From ea28c2b38da8a9fb6cf7e3a660da05da258d61c8 Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Wed, 28 Jun 2023 14:13:14 +0100 Subject: [PATCH 5/6] Remove wait --- src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py b/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py index 80384370d..30e72451e 100644 --- a/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py +++ b/src/artemis/experiment_plans/tests/test_fast_grid_scan_plan.py @@ -400,5 +400,4 @@ def get_good_status(): ) RE(bps.stage(fake_fgs_composite.eiger)) - fake_fgs_composite.eiger.arming_status.wait(60) fake_fgs_composite.eiger._wait_fan_ready.assert_called_once() From bf1c3f1ef0a10469b275e81b1f22959238694a8c Mon Sep 17 00:00:00 2001 From: Oliver Silvester Date: Wed, 28 Jun 2023 14:15:46 +0100 Subject: [PATCH 6/6] dodal --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fb3351fe4..18ac81d25 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,7 +36,7 @@ install_requires = xarray doct databroker - dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@c6f0e617b0675323b4ea2bddfd9652700dc767ce + dodal @ git+https://github.com/DiamondLightSource/python-dodal.git@b49b2dffa27e44eebf42e8c7e35a375da42654cd [options.extras_require] dev =