3146 Commits

Author SHA1 Message Date
b355343545 Update __init__.py 2022-07-27 06:28:32 +00:00
54cc5e16d2 Merge branch 'master' into 'online_changes'
# Conflicts:
#   bec_client/bec_client/__init__.py
2022-07-27 06:27:31 +00:00
6aef1c7460 Update __init__.py 2022-07-27 06:27:08 +00:00
e20216
688b6bc0ac online changes for first fly scan with lamni 2022-07-26 13:58:54 +02:00
ad1bf0ee65 Merge branch 'online_changes' into 'master'
added pre scan macros; closes #38

Closes #38

See merge request bec/bec!16
2022-07-26 07:55:01 +00:00
5c44742ae7 added lrange, lpush, rpush functions to producermock 2022-07-26 09:53:53 +02:00
aec12f993d added pre scan macros 2022-07-26 09:45:13 +02:00
3e7eec07f4 Merge branch 'online_changes' into 'master'
Online changes

See merge request bec/bec!15
2022-07-25 18:05:27 +00:00
186e30eb6c cleanup 2022-07-25 20:04:05 +02:00
4f151a0f4e renamed scantype to scan_type 2022-07-25 19:07:21 +02:00
65a2ff0b5c Merge branch 'master' into online_changes 2022-07-25 13:51:02 +02:00
e20216
9d52f5bdd0 added limits to LamNI devices 2022-07-25 13:48:13 +02:00
e20216
b022848f88 added rpc output print to logger 2022-07-25 13:47:34 +02:00
e20216
fb10b7f583 online changes for LamNIFermatScan 2022-07-25 13:46:23 +02:00
f2226f2e44 added device storage for async readings 2022-07-25 13:42:33 +02:00
ae51321421 changed signal handling for fly scans 2022-07-25 13:41:43 +02:00
37b0b72f8f bug fix for bundler; added lock to queue update; added scan abort notification 2022-07-23 20:46:21 +02:00
5628c83272 removed debugging output to tests 2022-07-23 18:30:50 +02:00
535d4a08e2 added debugging output to tests 2022-07-23 16:37:09 +02:00
ff1e4becd0 added debugging output to tests 2022-07-23 16:15:38 +02:00
5fa0e24d7e removed timeout in scan bundler 2022-07-23 15:22:17 +02:00
522d8f16f2 changed default timeout to 200 s 2022-07-23 11:00:08 +02:00
f1a464d71f added explicit check for scan abort test 2022-07-23 10:57:34 +02:00
614e6f5f01 added more delay to scan abort test 2022-07-23 10:20:02 +02:00
6f33e4004e cleanup 2022-07-23 10:19:08 +02:00
25e2ebd361 avoid prel exit in client callback 2022-07-23 08:43:48 +02:00
d8b1561501 added alarm check 2022-07-23 08:35:15 +02:00
5c3ec5f4ab fixed bug in client callback 2022-07-22 22:16:38 +02:00
d7e335ddbe bug fix in client callback 2022-07-22 21:52:49 +02:00
372072a55f Merge branch 'fly_scan' into 'master'
fly scan; closes #9 #10

Closes #10 and #9

See merge request bec/bec!14
2022-07-22 19:35:33 +00:00
9fe9adec33 bug fixes for fly scan support 2022-07-22 21:26:55 +02:00
f4b7e67f5e bug fixes for fly scans; added parallelpool for scan bundler and device server 2022-07-22 16:47:01 +02:00
006db98983 scan bundler is now only triggered by scan msgs 2022-07-22 10:25:12 +02:00
c7e34b8f66 reduced logger output 2022-07-21 22:49:27 +02:00
9d0dc7c72b fixed bug in scan bundler 2022-07-21 16:15:15 +02:00
7a23c5512c Merge branch 'master' into fly_scan 2022-07-21 14:48:25 +02:00
f1e832f397 Merge branch 'online_changes' into 'master'
Online changes

See merge request bec/bec!13
2022-07-21 12:24:58 +00:00
e20216
70f9b196df online changes 2022-07-21 14:23:11 +02:00
e20216
d5416fad0b Merge branch 'online_changes' of https://gitlab.psi.ch/bec/bec into online_changes 2022-07-21 10:05:00 +02:00
e20216
5f93de367e figures saved to disk 2022-07-21 10:03:54 +02:00
69628dfb50 Update demo.py 2022-07-21 07:49:37 +00:00
2c7687fd1e added matplotlib for debugging plots 2022-07-21 07:46:17 +00:00
ed4346c0f7 prel. fly scan implementation 2022-07-21 09:38:25 +02:00
e20216
f56d4331e8 fixed formatting 2022-07-20 16:51:05 +02:00
e20216
806c4ff2d6 online_changes 2022-07-20 16:47:54 +02:00
e20216
60804bd0e6 Merge branch 'master' into online_changes 2022-07-20 11:06:07 +02:00
e20216
a03978097a online changes 2022-07-20 10:01:25 +02:00
e20216
583bbbaefb added debug output to req done 2022-07-20 10:00:49 +02:00
32ec10c3a8 reduced num points for queued scan test 2022-07-20 09:42:38 +02:00
b3220772e7 added scan_type to open_scan message 2022-07-20 09:00:28 +02:00