512 Commits

Author SHA1 Message Date
e54ef0c63f added test placeholder 2022-09-18 13:03:47 +02:00
d556ed9c50 refactoring; added test for device connection 2022-09-18 13:03:28 +02:00
0b8997434f Merge branch 'master' into online_changes 2022-09-18 12:19:03 +02:00
dbead680a5 Merge branch 'scan_number' into 'master'
Scan number

See merge request bec/bec!44
2022-09-18 10:17:40 +00:00
6ce6633f8a fixed bug in assertion 2022-09-18 10:14:51 +02:00
df3fa75da6 added timeout to bec services 2022-09-17 23:38:59 +02:00
8b675e08ff ensured that scan abortion is sent after pause 2022-09-17 23:38:25 +02:00
19032c5044 added logger info to scan modifications 2022-09-17 23:37:48 +02:00
a91810c04d added logger to thread exceptions 2022-09-17 22:29:21 +02:00
025c36a56e thread safety 2022-09-17 22:03:27 +02:00
9116028a8d fixed bug in config handler init 2022-09-17 21:00:36 +02:00
452ee1f26c fixed bug in client callback 2022-09-17 20:21:41 +02:00
35619361b7 fixed test 2022-09-17 10:33:38 +02:00
d5c2be6bf3 get the current scan queue info from redis 2022-09-17 10:22:22 +02:00
8d25960b14 black 2022-09-17 10:01:57 +02:00
e20216
beea5763f1 Merge branch 'online_changes' of https://gitlab.psi.ch/bec/bec into online_changes 2022-09-17 09:56:18 +02:00
e20216
f63cf0d78f fixed bug in device_server instructions 2022-09-17 09:54:19 +02:00
c7e623301b fixed test 2022-09-16 23:08:44 +02:00
dad7d02155 fixed device msg type error 2022-09-16 22:46:54 +02:00
a3ecf7a91e fixed test 2022-09-16 22:36:21 +02:00
b9344cc366 added scan guard tests 2022-09-16 22:25:55 +02:00
aec8c0d18b refactoring 2022-09-16 22:13:49 +02:00
9970b10ad9 added scan worker tests 2022-09-16 22:10:26 +02:00
ef01f03bcf ensure that only existing storage units are removed 2022-09-16 21:12:27 +02:00
405ef35788 abort scan test 2022-09-16 21:11:45 +02:00
b2b7502f73 scan number prediction 2022-09-16 20:40:34 +02:00
0907aa59cb scan number prediction 2022-09-16 20:39:55 +02:00
187cb4110a added checks to tests to ensure that the scan number is correct 2022-09-16 20:39:09 +02:00
1f39b8b7f5 added current scan number property to scan manager 2022-09-16 20:38:35 +02:00
e20216
cfd854d083 bug fix for failed movements 2022-09-16 17:40:02 +02:00
e20216
c876e19eb7 bug fix for device lists 2022-09-16 17:39:21 +02:00
e20216
ffbdf205d0 fixed bug in controller init; added sub to signals 2022-09-16 17:38:26 +02:00
e20216
bf848e2c3e added support for kwargs of EpicsSignalBase 2022-09-16 17:36:11 +02:00
cb324cb1a9 prel commit for scan number prediction 2022-09-15 10:38:59 +02:00
2f7558f6b5 Merge branch 'revert-aa1f3dcd' into 'master'
Revert "Merge branch 'revert-a1ead9b6' into 'master'"

See merge request bec/bec!41
2022-09-14 17:33:49 +00:00
a7f40fec9c bug fix for basic requests 2022-09-14 16:58:46 +02:00
95c5c99bf2 added scan_items test 2022-09-14 16:57:53 +02:00
551b1d7bd0 fixed test for new abort handling 2022-09-14 16:44:23 +02:00
89f2eb2503 changed abort handling; now within the instruction loop to avoid clearing the queue 2022-09-14 16:38:57 +02:00
43681f96ba Revert "Merge branch 'revert-a1ead9b6' into 'master'"
This reverts merge request !40
2022-09-14 10:48:00 +00:00
aa1f3dcd1a Merge branch 'revert-a1ead9b6' into 'master'
Revert "Merge branch 'cleanup_after_stop' into 'master'"

See merge request bec/bec!40
2022-09-14 10:47:14 +00:00
09bd00a405 Revert "Merge branch 'cleanup_after_stop' into 'master'"
This reverts merge request !39
2022-09-14 10:40:23 +00:00
a1ead9b658 Merge branch 'cleanup_after_stop' into 'master'
cleanup after stop

See merge request bec/bec!39
2022-09-14 08:02:27 +00:00
c8525ae811 tests 2022-09-14 09:56:07 +02:00
6c9dbd41c2 fixed abort test 2022-09-14 09:02:57 +02:00
e9234888f3 cleanup after stop 2022-09-14 08:41:30 +02:00
ba962fc49b Merge branch 'detector_sim' into 'master'
detector sim

See merge request bec/bec!38
2022-09-12 15:32:49 +00:00
a45271f6d3 re-enabled detector sim 2022-09-12 17:07:54 +02:00
de9493407b Merge branch 'service_status' into 'master'
changes to ensure that services are unique and only launched once

See merge request bec/bec!37
2022-09-12 14:49:53 +00:00
134e758eee created keys method for redis connector; fixed tests 2022-09-12 16:43:27 +02:00