|
|
ec76590f28
|
Merge branch 'developer' into bursts
|
2020-02-26 09:29:18 +01:00 |
|
|
|
2fcb2bff75
|
dac tests
|
2020-02-26 09:29:06 +01:00 |
|
|
|
2310b5e55d
|
Merge branch 'developer' into bursts
|
2020-02-25 20:03:18 +01:00 |
|
|
|
dca2d098a9
|
gui: hide gain legend
|
2020-02-25 20:03:09 +01:00 |
|
|
|
462bc2e70c
|
Merge branch 'developer' into bursts
|
2020-02-25 18:22:58 +01:00 |
|
|
|
2da3d179ee
|
gotthard2 gain plot in gui
|
2020-02-25 18:22:18 +01:00 |
|
|
|
5e6a3b7e3d
|
merge resolved
|
2020-02-25 15:48:41 +01:00 |
|
|
|
6a0a931e3e
|
gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes
|
2020-02-25 15:45:40 +01:00 |
|
|
|
2bec476b4f
|
fixed failed tests
|
2020-02-25 09:26:57 +01:00 |
|
|
|
f902bb06ad
|
gui bug fix: trigger timing mode was disconnected
|
2020-02-24 17:40:00 +01:00 |
|
|
|
c03bc4a6b4
|
gotthard2: copy #frames and period when switching between continuous and burst mode
|
2020-02-24 17:20:51 +01:00 |
|
|
|
6118567959
|
gotthard2 gui bug fix: gainbit not masked out
|
2020-02-24 17:04:37 +01:00 |
|
|
|
02b367ffe8
|
mythen3 and gotthard2: updated clocks
|
2020-02-24 16:50:47 +01:00 |
|
|
|
87d48fd943
|
bugfix rxr numpacketscaught if stopped
|
2020-02-24 15:02:01 +01:00 |
|
|
|
21a1b872bf
|
bugfix:mythen3 date change
|
2020-02-24 11:00:16 +01:00 |
|
|
|
3a74ca8fc2
|
bugfix: mythen3 git date incorrect
|
2020-02-24 10:53:06 +01:00 |
|
|
|
f4b922165f
|
bugfix from earlier commit: dr in readfromreceiver commented out
|
2020-02-24 10:36:52 +01:00 |
|
|
|
247d40f5a6
|
added Zmq image structures
|
2020-02-21 11:56:44 +01:00 |
|
|
|
8953235268
|
reverted to UdpRxSocket.h version of revision fc27cfd (with gcc problem fixed)
|
2020-02-21 11:07:24 +01:00 |
|
|
|
3b84684415
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-18 18:26:19 +01:00 |
|
|
|
d0da5d3fcd
|
update manual
|
2020-02-18 18:26:11 +01:00 |
|
|
|
52a89cbcc5
|
fix for older gcc
|
2020-02-18 17:54:28 +01:00 |
|
|
|
d8c9748850
|
update manual to 4.1.1
|
2020-02-18 15:49:00 +01:00 |
|
|
|
f42e87e37f
|
format
|
2020-02-18 15:03:02 +01:00 |
|
|
|
53a3656d5e
|
removed copy, fixed receive to external buffer
|
2020-02-18 15:02:40 +01:00 |
|
|
|
fc27cfd663
|
merging problem
|
2020-02-18 10:55:41 +01:00 |
|
|
|
6b0bf02a85
|
Some fixes to use moench
|
2020-02-18 10:45:53 +01:00 |
|
|
|
f1bce15a57
|
replaced udp socket
|
2020-02-17 17:43:14 +01:00 |
|
|
|
3ea9b86bf5
|
date fix
|
2020-02-13 14:50:23 +01:00 |
|
|
|
4cce0aee62
|
Fixed ctbGui to work also with moench03
|
2020-02-06 14:28:20 +01:00 |
|
|
|
dfb1b9ad69
|
Revert "gotthard2: burst mode check"
This reverts commit 4d6996bd55.
|
2020-02-04 15:29:43 +01:00 |
|
|
|
4d6996bd55
|
gotthard2: burst mode check
|
2020-02-04 15:28:24 +01:00 |
|
|
|
0ac28c0208
|
gotthard2: burst mode check for #frames
|
2020-02-04 15:27:18 +01:00 |
|
|
|
37c3048c2a
|
gotthard2: bug fix from previosu commit
|
2020-02-04 12:32:37 +01:00 |
|
|
|
d3dc9a7690
|
gotthard2: disentangled burst mode #frames, exptime, period from start of acquisition, order dependent now for debugging
|
2020-02-04 12:23:58 +01:00 |
|
|
|
c4559fadb3
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-04 12:00:15 +01:00 |
|
|
|
806a2736c1
|
gotthard2: longer wait for startup, period 0
|
2020-02-04 12:00:07 +01:00 |
|
|
|
94fcf52e64
|
Merge pull request #76 from slsdetectorgroup/exec
Buffern in exec
|
2020-02-04 10:59:48 +01:00 |
|
|
|
64214f22f9
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-04 10:50:14 +01:00 |
|
|
|
36bd91daa3
|
gotthard2: sleep before configuring on chip dacs, default exptime 0 and default period to 1ms
|
2020-02-04 10:50:01 +01:00 |
|
|
|
40bfca588b
|
minor from clang-tidy
|
2020-02-04 10:36:03 +01:00 |
|
|
|
b9446f40d1
|
fmt and minor
|
2020-02-04 10:11:27 +01:00 |
|
|
|
ec66079f65
|
renamed ServerInterface
|
2020-02-04 08:57:35 +01:00 |
|
|
|
e6340456f6
|
minor
|
2020-02-04 08:47:22 +01:00 |
|
|
|
f42d591845
|
sizeof
|
2020-02-03 16:51:57 +01:00 |
|
|
|
e9029ba8f2
|
removed unused functions
|
2020-02-03 16:44:14 +01:00 |
|
|
|
121747352d
|
buffer
|
2020-02-03 16:35:30 +01:00 |
|
|
|
4cfea36b93
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
|
2020-02-03 16:00:32 +01:00 |
|
|
|
a829e69313
|
minor
|
2020-02-03 16:00:24 +01:00 |
|
|
|
42124ca97c
|
eiger rxr: setting exptime now also sets subperiod in rxr master file
|
2020-02-03 15:54:41 +01:00 |
|
