1029 Commits

Author SHA1 Message Date
af16ad4040 vetoalg: wip 2021-07-20 12:58:05 +02:00
1b348f9b3a binaries in 2021-07-15 21:17:29 +02:00
5e685ea5a6 resolving merge from 5.2.0-rc 2021-07-15 21:16:42 +02:00
c3ad736d3c binaries in 2021-07-15 16:28:40 +02:00
780d4bfe0a gotthard2: vetostream (detector: only 3gbe, 10gbe via numudpinterfaces) 2021-07-15 16:21:17 +02:00
8354395f64 wip 2021-07-15 13:44:42 +02:00
a127f8c97a g2: badchanels moved to a new register base 2021-07-14 16:03:13 +02:00
86d1a18ca1 binaries in 2021-07-14 15:28:53 +02:00
016d0d7fac jungfrau server: temporary fix made to reset core when stopping state machine. problem: stopping in trigger mode and then switching to auto mode blocks data streaming from detector 2021-07-14 15:28:09 +02:00
e1c76fb04a binaries in 2021-07-14 12:27:30 +02:00
2d182f3cee gotthard2 server: tolerance in time parameters fixed by adding 0.5 2021-07-14 12:26:29 +02:00
c6aaf2f8b1 binaries in 2021-07-14 09:41:50 +02:00
f9feabaacf fix 2021-07-12 16:32:55 +02:00
ff4ca4af6c fix 2021-07-12 16:32:25 +02:00
fdf6632356 wip 2021-07-05 15:20:34 +02:00
5ad2299e83 binaries in 2021-07-02 19:55:45 +02:00
cbdb05a3a8 wip 2021-07-01 15:11:22 +02:00
54b9b9938c binaries in after merge conflict 2021-07-01 14:35:29 +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
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