d80006a024
Merge branch 'developer' into rxacqIndices
2022-03-17 09:03:32 +01:00
Erik Frojdh
561777dad6
fixed clang--format version
2022-03-17 09:02:40 +01:00
c1895c4bc8
Merge branch 'developer' into rxacqIndices
2022-03-17 08:48:15 +01:00
Dhanya Thattil
7bd4b9d9d9
Merge pull request #397 from slsdetectorgroup/setmaster
...
Setmaster
2022-03-17 08:42:06 +01:00
39d3ee2b15
merge fix
2022-03-17 08:41:49 +01:00
Erik Frojdh
401467c700
updated scripts and generated detector.cpp
2022-03-16 18:29:33 +01:00
Dhanya Thattil
c9769579e3
Merge pull request #388 from slsdetectorgroup/eiger12
...
eiger 12 bit mode
2022-03-16 16:50:41 +01:00
7d91a15834
Merge branch 'setmaster' of github.com:slsdetectorgroup/slsDetectorPackage into setmaster
2022-03-16 14:50:40 +01:00
43c46841c1
minor
2022-03-16 14:44:26 +01:00
fc6c6985e6
binary in
2022-03-16 13:26:28 +01:00
14c63810d6
minor
2022-03-16 13:23:23 +01:00
6f0eebfbb8
fix
2022-03-16 13:18:59 +01:00
c8bed64b91
Merge branch 'setmaster' of github.com:slsdetectorgroup/slsDetectorPackage into setmaster
2022-03-16 13:16:31 +01:00
e1762605e8
fix for eiger server actual detector
2022-03-16 13:16:25 +01:00
62fff64d87
eiger binary in
2022-03-16 12:51:53 +01:00
7a39822813
fixes for set top, masterin api
2022-03-16 12:49:22 +01:00
de9e83fd61
set slave for m3 virtual
2022-03-16 12:07:03 +01:00
45171d82a4
minor
2022-03-16 09:56:03 +01:00
34588356e8
added top
2022-02-28 17:05:24 +01:00
b6d63a8381
master tests
2022-02-28 16:28:15 +01:00
dd8aebb0ab
eiger server binaries
2022-02-28 14:56:40 +01:00
261ac78743
wip
2022-02-28 14:49:02 +01:00
0437bd0584
Wip
2022-02-28 12:28:03 +01:00
46578d1447
wip
2022-02-25 17:50:32 +01:00
5566cfd24f
configuing master from command lineg
2022-02-25 16:03:11 +01:00
5869c25658
wip, top, master command line
2022-02-24 17:06:10 +01:00
Dhanya Thattil
0b7c202f98
datastream 10g Receiver ( #401 )
...
* datastream not updated when tengiga enabled in receiver
2022-02-24 16:16:48 +01:00
4db34effda
fixed tests
2022-02-24 11:57:00 +01:00
5a5d4eadf1
minor
2022-02-24 11:27:29 +01:00
b9016fad12
reverting to normal command parsing for missing packets
2022-02-24 11:26:17 +01:00
a1ee681135
- framescaught and frameindex now returns a vector for each port
...
- progress looks at activated or enabled ports, so progress does not stagnate
- (eiger) disable datastreaming also for virtual servers only for 10g
- missing packets also takes care of disabled ports
2022-02-24 11:15:03 +01:00
219318a52e
wip, removed extra virutal server binaries for eiger, --ignore-config for command line
2022-02-23 17:31:46 +01:00
89edf58f41
wip, setmaster
2022-02-23 12:26:37 +01:00
ef3df36e55
merge fix
2022-02-23 11:40:50 +01:00
6d2302bcc1
Merge branch 'developer' into eiger12
2022-02-23 10:32:22 +01:00
939fc70284
bug fix in startDetector vector
2022-02-23 10:32:06 +01:00
6695b10354
binaries in
2022-02-23 10:30:05 +01:00
94adba72bf
bugfix for 12bit to 16 bit expansion in server
2022-02-23 10:26:37 +01:00
1063e8b929
warnings
2022-02-23 10:09:06 +01:00
c9abeace8f
warnings
2022-02-23 10:08:50 +01:00
5bfdbf59a2
warnings
2022-02-23 10:07:00 +01:00
1cd347a54d
minor printing
2022-02-23 10:03:23 +01:00
76eb09eb04
binaries in
2022-02-23 09:59:41 +01:00
a936cc26cc
bugfix, always 12 dr
2022-02-23 09:58:55 +01:00
92beb3aa2a
bug fix from an earlier PR, slaves.begin()
2022-02-23 09:32:25 +01:00
543eb7bb60
merge fixed
2022-02-23 09:23:00 +01:00
Dhanya Thattil
2034362eca
Merge pull request #396 from slsdetectorgroup/ctbupdate
...
updatemode
2022-02-23 09:16:00 +01:00
7245db5cc8
binaries in
2022-02-23 09:15:20 +01:00
8c4a4b7182
merge fix
2022-02-23 09:14:43 +01:00
11ad019d47
changing manual list size entry for allowed funcs in server update mode
2022-02-23 09:12:51 +01:00
