7286 Commits

Author SHA1 Message Date
a1da362d2e Wip 2021-07-01 15:58:06 +02:00
0b3af803ce wip 2021-07-01 15:51:19 +02:00
cbdb05a3a8 wip 2021-07-01 15:11:22 +02:00
Dhanya Thattil
ece676ea76
Merge pull request #250 from slsdetectorgroup/stopacq
Stopacq
2021-07-01 14:37:02 +02:00
54b9b9938c binaries in after merge conflict 2021-07-01 14:35:29 +02:00
9d8c68b1d0 wip 2021-07-01 14:23:33 +02:00
0e7c643cf9 wip 2021-07-01 00:03:05 +02:00
5ad3205fe8 wip 2021-06-30 16:50:05 +02:00
fca9982b72 wip 2021-06-30 13:03:31 +02:00
d7dc1912ac wip rewrite 2021-06-29 20:45:52 +02:00
ee1a1563ba wip rewrite 2021-06-29 20:45:46 +02:00
1e6f695949 binaries in 2021-06-28 17:57:57 +02:00
d7669ca4d4 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-28 17:57:19 +02:00
a20c2cdfb5 locking 2021-06-28 17:57:10 +02:00
9c7d13847e binaries in 2021-06-28 17:51:25 +02:00
8c1a813214 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-28 17:51:07 +02:00
3618f17666 wip 2021-06-28 17:51:00 +02:00
b347afd6f3 binaries in 2021-06-28 17:48:40 +02:00
0ed59953de Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-28 17:48:17 +02:00
2044ea1cc7 wip 2021-06-28 17:48:11 +02:00
68299820fd binaries in 2021-06-28 17:46:07 +02:00
814e8898d8 wip 2021-06-28 17:42:37 +02:00
dd8082da0b wip 2021-06-28 17:41:02 +02:00
60d726b379 wip 2021-06-28 17:36:38 +02:00
04a0a475ad wip 2021-06-28 17:32:11 +02:00
ca02d4b007 wip 2021-06-28 17:27:25 +02:00
343e881a3f wip 2021-06-28 17:26:09 +02:00
c0aaa94587 wip 2021-06-28 17:24:27 +02:00
12cdab19e9 wip 2021-06-28 17:23:33 +02:00
5177ed74e5 wip 2021-06-28 17:20:37 +02:00
28fde55e4b wip 2021-06-28 17:14:20 +02:00
4b05ecd80b wip 2021-06-28 17:12:57 +02:00
a7d46b701a wip 2021-06-28 17:11:01 +02:00
1bad39fd69 wip 2021-06-28 17:10:33 +02:00
2a85e7c71e wip 2021-06-28 17:09:37 +02:00
4a4fbddb79 wip 2021-06-28 17:07:09 +02:00
f8c2da3c83 wip 2021-06-28 16:44:45 +02:00
9d666da4cf binaries in 2021-06-28 13:33:24 +02:00
18fe63f594 wip 2021-06-28 13:32:44 +02:00
3295d36f46 wip 2021-06-28 12:17:46 +02:00
c63f3b327f wip 2021-06-25 17:20:34 +02:00
0a0e9bf490 wip 2021-06-25 17:20:16 +02:00
3394d8659b wip 2021-06-25 17:18:50 +02:00
9746875014 wip 2021-06-25 17:16:08 +02:00
8b22b5dbe7 wip 2021-06-25 17:13:40 +02:00
1b525abfa1 wip 2021-06-25 17:11:36 +02:00
a097687a69 wip 2021-06-25 17:07:53 +02:00
1360fbac87 eiger: block trigger till next wait for trigger and give error if it wasnt ready when trigger sent 2021-06-25 16:56:48 +02:00
bdfd151a01 wip 2021-06-25 16:54:01 +02:00
bbb2473387 wip 2021-06-25 16:46:07 +02:00