|
|
e02493d4e4
|
veotalg for g2
|
2021-07-20 14:57:31 +02:00 |
|
|
|
af16ad4040
|
vetoalg: wip
|
2021-07-20 12:58:05 +02:00 |
|
Dhanya Thattil
|
206c48c7a0
|
Merge pull request #264 from slsdetectorgroup/g2features
vetostream
|
2021-07-20 10:01:02 +02:00 |
|
Erik Frojdh
|
09391b767a
|
support for scoped enums and operators in Python
|
2021-07-16 14:48:22 +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 |
|
Dhanya Thattil
|
4fd949a833
|
Merge pull request #259 from slsdetectorgroup/g2timejreset
G2timejreset
|
2021-07-15 21:06:09 +02:00 |
|
|
|
3922789245
|
Merge branch 'g2features' of github.com:slsdetectorgroup/slsDetectorPackage into g2features
|
2021-07-15 17:03:36 +02:00 |
|
|
|
7158dab9f5
|
fix to ensure numinterfaces is not called for g2
|
2021-07-15 17:03:29 +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 |
|
|
|
4d7fb4e4e0
|
wip
|
2021-07-15 14:48:41 +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 |
|
|
|
1870ee8ae3
|
Merge branch '5.2.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 5.2.0-rc
|
2021-07-14 15:42:59 +02:00 |
|
|
|
823ceff328
|
minor
|
2021-07-14 15:42:53 +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 |
|
|
|
8308d2833d
|
Merge branch '5.2.0-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 5.2.0-rc
|
2021-07-14 15:21:26 +02:00 |
|
|
|
6c0795ea63
|
done with all tests for time parameters for g2
|
2021-07-14 15:21:10 +02:00 |
|
|
|
76ca4374e4
|
added tests to check time parameters tolerance for g2
|
2021-07-14 15:10:52 +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 |
|
|
|
abb26adc76
|
fixes
|
2021-07-13 17:14:29 +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 |
|
|
|
2d913b901d
|
wip
|
2021-07-02 19:49:37 +02:00 |
|
|
|
c30716db12
|
Wip
|
2021-07-02 16:09:57 +02:00 |
|
|
|
0e4fd598b1
|
wip
|
2021-07-02 10:10:46 +02:00 |
|
|
|
4422ce61aa
|
wip
|
2021-07-01 19:21:33 +02:00 |
|
|
|
eff15b3f89
|
wip
|
2021-07-01 16:11:40 +02:00 |
|
|
|
4b81cfbd6c
|
wip
|
2021-07-01 16:10:33 +02:00 |
|
|
|
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 |
|
