|
|
cc3aede979
|
merge fix
|
2021-08-06 16:11:58 +02:00 |
|
|
|
2c53a134cd
|
updated i3gbe to lll
|
2021-08-06 16:08:07 +02:00 |
|
|
|
9f6b951988
|
merge fix
|
2021-08-06 15:04:25 +02:00 |
|
|
|
bc5d6a0309
|
biaries in
|
2021-08-06 15:02:43 +02:00 |
|
|
|
64535c2143
|
set for vetoalg, although currently no difference
|
2021-08-06 15:02:06 +02:00 |
|
|
|
122f0a4a87
|
merge from 5.2.0-rc
|
2021-07-27 17:08:59 +02:00 |
|
|
|
61198eed5f
|
mythen3 binaries in
|
2021-07-27 17:04:48 +02:00 |
|
|
|
1e441af30b
|
g2: allowing module id values for master and slave modules
|
2021-07-27 17:02:20 +02:00 |
|
|
|
252f5a3e7b
|
eiger fix for status idle in blocking trigger, readyfortrigger is not up indefinitely, so have to look at status
|
2021-07-27 16:31:34 +02:00 |
|
|
|
da4d47052d
|
binaries in
|
2021-07-22 14:01:26 +02:00 |
|
|
|
5b05a30287
|
merge conflict fix
|
2021-07-22 13:52:55 +02:00 |
|
|
|
97ff58c978
|
binaries in
|
2021-07-22 13:48:17 +02:00 |
|
|
|
3d47db7e60
|
bug fix for virtual datastream and client
|
2021-07-22 13:47:18 +02:00 |
|
|
|
05b7e0ef42
|
conflict merge fix
|
2021-07-22 11:53:00 +02:00 |
|
|
|
da996314e7
|
merge conflict
|
2021-07-22 11:15:57 +02:00 |
|
|
|
d052efbd23
|
binaries in
|
2021-07-21 14:12:15 +02:00 |
|
|
|
69b04cc4f8
|
minor
|
2021-07-21 14:11:58 +02:00 |
|
|
|
3bee03bb3a
|
minor
|
2021-07-21 14:11:27 +02:00 |
|
|
|
538b7d0925
|
minor
|
2021-07-21 14:10:34 +02:00 |
|
|
|
df300d29d2
|
minor
|
2021-07-21 14:08:47 +02:00 |
|
|
|
1e1c799223
|
eiger quad server: set and reset chip signals before and after trimming
|
2021-07-21 14:05:28 +02:00 |
|
|
|
91eba6a8b8
|
binaries in
|
2021-07-21 12:32:04 +02:00 |
|
|
|
8ba37e99a7
|
added enum left right top bottom
|
2021-07-21 09:25:27 +02:00 |
|
|
|
ec7ba7c508
|
wip to change to enum for portposition
|
2021-07-20 16:05:08 +02:00 |
|
|
|
e02493d4e4
|
veotalg for g2
|
2021-07-20 14:57:31 +02:00 |
|
|
|
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 |
|
