Erik Frojdh
|
e884836f5c
|
Merge branch 'vetoheader' of github.com:slsdetectorgroup/slsDetectorPackage into vetoheader
|
2020-05-28 11:33:59 +02:00 |
|
Erik Frojdh
|
104d91e8c6
|
more jf stuff
|
2020-05-28 11:33:52 +02:00 |
|
|
9ddebc4c09
|
binaries in
|
2020-05-28 10:36:17 +02:00 |
|
|
0525e374b2
|
settign veto also configures mac, sending veto data for 10gb only if veto and numinterfaces==2, changed veto entry offset
|
2020-05-28 10:35:48 +02:00 |
|
|
e727b97d75
|
gottahrd2 binary in
|
2020-05-28 09:46:12 +02:00 |
|
|
5ca987ecbb
|
Merge branch 'vetoheader' of github.com:slsdetectorgroup/slsDetectorPackage into vetoheader
|
2020-05-28 09:44:32 +02:00 |
|
|
2a64a9f6e0
|
gotthard2: removed check for module attached when setting veto, for later
|
2020-05-28 09:44:25 +02:00 |
|
Erik Frojdh
|
a708da5455
|
Merge branch 'vetoheader' of github.com:slsdetectorgroup/slsDetectorPackage into vetoheader
|
2020-05-28 09:29:02 +02:00 |
|
Erik Frojdh
|
e2eb1598d3
|
jf stuff
|
2020-05-28 09:28:53 +02:00 |
|
|
d175ba0936
|
check for module attached only when enabling veto streaming, not disabling
|
2020-05-28 09:21:19 +02:00 |
|
|
6189fd157a
|
gotthard2: cehck if module attached when setting veto to 1
|
2020-05-28 09:19:55 +02:00 |
|
Erik Frojdh
|
6c753f3b50
|
veto
|
2020-05-28 08:48:11 +02:00 |
|
|
098d3e6d98
|
gotthard2: binaries in
|
2020-05-27 14:39:28 +02:00 |
|
|
4300e95a8e
|
virtual, adding veto command
|
2020-05-27 14:37:52 +02:00 |
|
|
46daa7e2de
|
merge from developer (mythen3 branch)
|
2020-05-27 14:19:33 +02:00 |
|
Dhanya Thattil
|
754536898a
|
Merge pull request #100 from slsdetectorgroup/mythen3
Mythen3
|
2020-05-27 14:12:52 +02:00 |
|
Erik Frojdh
|
20bfe92573
|
gatedelay
|
2020-05-27 14:02:33 +02:00 |
|
|
9493ae3da9
|
WIP
|
2020-05-27 11:30:47 +02:00 |
|
Erik Frojdh
|
0fca9fba79
|
Merge branch 'mythen3' of github.com:slsdetectorgroup/slsDetectorPackage into mythen3
|
2020-05-27 11:30:23 +02:00 |
|
Erik Frojdh
|
b543708d9d
|
exptime
|
2020-05-27 11:30:11 +02:00 |
|
|
e0ea08332f
|
gotthard2: fix in rxr for gotthard2
|
2020-05-26 17:44:31 +02:00 |
|
|
e229fee6ba
|
gotthard2: hv soft max uptdated to 500v
|
2020-05-26 14:59:48 +02:00 |
|
|
44a88893ba
|
mythen3: hv soft max uptdated to 500v
|
2020-05-26 14:58:41 +02:00 |
|
Erik Frojdh
|
f4ba46c19b
|
update function and enum generation
|
2020-05-26 11:26:24 +02:00 |
|
|
37cb0bb1c0
|
minor PR fixes
|
2020-05-26 08:57:48 +02:00 |
|
|
f293ba8c56
|
gui cmake fix
|
2020-05-26 08:50:09 +02:00 |
|
|
e9ca17f860
|
Merge branch 'vetoheader' of github.com:slsdetectorgroup/slsDetectorPackage into vetoheader
|
2020-05-25 14:23:45 +02:00 |
|
|
30391a2faf
|
veto header size in server using sizeof
|
2020-05-25 14:23:10 +02:00 |
|
|
7ba877446c
|
gotthard2 binary
|
2020-05-25 12:21:44 +02:00 |
|
|
6bdc506a34
|
veto header smaller size
|
2020-05-25 12:20:40 +02:00 |
|
|
9592d1760f
|
gui fix
|
2020-05-25 11:09:26 +02:00 |
|
|
8ffb27c300
|
WIP
|
2020-05-25 11:05:51 +02:00 |
|
|
0a66605111
|
tests mainly and minor print
|
2020-05-22 15:23:56 +02:00 |
|
|
02d8b1fb5f
|
mythen3 binary
|
2020-05-20 17:30:40 +02:00 |
|
|
457f31ed61
|
mythen3 server minor print fix
|
2020-05-20 17:30:07 +02:00 |
|
|
be3f095b56
|
gui minor fix
|
2020-05-20 17:27:22 +02:00 |
|
|
174bb32744
|
gui minor fix
|
2020-05-20 17:26:57 +02:00 |
|
|
07d90d127f
|
gui fix
|
2020-05-20 17:25:39 +02:00 |
|
|
0debd6a457
|
mythen3: auto mode does not ignore #triggers
|
2020-05-20 17:12:45 +02:00 |
|
|
8f0ef68029
|
binaries in
|
2020-05-20 17:07:41 +02:00 |
|
|
d71e40729a
|
external signals
|
2020-05-20 17:05:42 +02:00 |
|
|
9475e01062
|
gui done
|
2020-05-20 12:41:14 +02:00 |
|
|
dc8f67cd7b
|
gui fix
|
2020-05-20 12:04:48 +02:00 |
|
|
3ebb1fca02
|
gui WIP
|
2020-05-20 11:51:18 +02:00 |
|
|
8973ef1aaa
|
from timetest merge
|
2020-05-20 10:18:51 +02:00 |
|
|
5690914048
|
Merge branch 'mythen3' of github.com:slsdetectorgroup/slsDetectorPackage into mythen3
|
2020-05-20 10:15:04 +02:00 |
|
|
fa768e584e
|
rxr
|
2020-05-20 10:14:57 +02:00 |
|
Dhanya Thattil
|
62e69b900b
|
Merge pull request #99 from slsdetectorgroup/timetest
directly writing exptime
|
2020-05-20 09:56:34 +02:00 |
|
Erik Frojdh
|
30fc346e22
|
directly writing exptime
|
2020-05-20 09:47:41 +02:00 |
|
Erik Frojdh
|
761f93d753
|
exptime of gates
|
2020-05-20 09:36:43 +02:00 |
|