|
|
6c95bf171b
|
Merge branch 'test' into developer
2020.06.08.dev0
|
2020-06-05 09:07:42 +02:00 |
|
|
|
fd948f1a00
|
updated binaries
|
2020-06-05 09:06:49 +02:00 |
|
|
|
ff9811895f
|
WIP
|
2020-06-05 09:04:32 +02:00 |
|
|
|
7f6d57d6ba
|
WIP
|
2020-06-04 17:42:24 +02:00 |
|
|
|
099805ba8b
|
WIP
|
2020-06-04 17:02:56 +02:00 |
|
|
|
1e2a3f2767
|
WIP
|
2020-06-04 15:21:53 +02:00 |
|
|
|
9a8300ca08
|
WIP
|
2020-06-04 12:12:40 +02:00 |
|
|
|
40257fc82d
|
Adds the stripDetector daemon
|
2020-06-04 11:50:33 +02:00 |
|
|
|
3bdc8e95ce
|
WIP
|
2020-06-03 16:10:47 +02:00 |
|
|
|
223e24f924
|
WIP
|
2020-06-03 14:56:24 +02:00 |
|
|
|
4053594c4d
|
WIP
|
2020-06-03 14:40:51 +02:00 |
|
|
|
f07e722d26
|
read/write reg moved to stop server, tests
|
2020-06-02 11:56:50 +02:00 |
|
|
|
2ef8f2f046
|
WIP
|
2020-05-29 19:36:41 +02:00 |
|
|
|
0e514a470d
|
gotthard2 config example
|
2020-05-29 17:04:54 +02:00 |
|
|
|
294612b03c
|
WIP
|
2020-05-29 17:04:10 +02:00 |
|
|
|
f223415f94
|
fix for testing
|
2020-05-29 16:26:57 +02:00 |
|
|
|
c6ff50d753
|
merge vetoheader
|
2020-05-29 10:50:33 +02:00 |
|
|
|
f0a318777c
|
mythen3 bnaries in
|
2020-05-28 13:11:32 +02:00 |
|
|
|
8aa7144252
|
mythen3: fix of external signals to not allow master output inversion, but can edge detect not configurable, and default dout pulse length
|
2020-05-28 13:09:09 +02:00 |
|
|
|
15eea51f12
|
gotthard2 new firmware veto header reduced to 16 (frames, bunchid)
|
2020-05-28 12:44:03 +02:00 |
|
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 |
|
